Show More
@@ -1687,11 +1687,22 b' class queue(object):' | |||
|
1687 | 1687 | if existing: |
|
1688 | 1688 | if filename == '-': |
|
1689 | 1689 | raise util.Abort(_('-e is incompatible with import from -')) |
|
1690 | if not patchname: | |
|
1691 |
|
|
|
1692 | self.check_reserved_name(patchname) | |
|
1693 |
if not os.path.isfile( |
|
|
1694 |
raise util.Abort(_("patch %s does not exist") % |
|
|
1690 | filename = normname(filename) | |
|
1691 | self.check_reserved_name(filename) | |
|
1692 | originpath = self.join(filename) | |
|
1693 | if not os.path.isfile(originpath): | |
|
1694 | raise util.Abort(_("patch %s does not exist") % filename) | |
|
1695 | ||
|
1696 | if patchname: | |
|
1697 | self.check_reserved_name(patchname) | |
|
1698 | checkfile(patchname) | |
|
1699 | ||
|
1700 | self.ui.write(_('renaming %s to %s\n') | |
|
1701 | % (filename, patchname)) | |
|
1702 | os.rename(originpath, self.join(patchname)) | |
|
1703 | else: | |
|
1704 | patchname = filename | |
|
1705 | ||
|
1695 | 1706 | else: |
|
1696 | 1707 | try: |
|
1697 | 1708 | if filename == '-': |
@@ -109,3 +109,12 b' hg up -C' | |||
|
109 | 109 | hg qimport --push another.diff |
|
110 | 110 | hg qfin -a |
|
111 | 111 | hg qimport -rtip -P |
|
112 | ||
|
113 | hg qpop -a | |
|
114 | hg qdel -k 2.diff | |
|
115 | echo % qimport -e | |
|
116 | hg qimport -e 2.diff | |
|
117 | hg qdel -k 2.diff | |
|
118 | echo % qimport -e --name newname oldexisitingpatch | |
|
119 | hg qimport -e --name this-name-is-better 2.diff | |
|
120 | hg qser |
@@ -52,3 +52,12 b' applying another.diff' | |||
|
52 | 52 | now at: another.diff |
|
53 | 53 | patch b.diff finalized without changeset message |
|
54 | 54 | patch another.diff finalized without changeset message |
|
55 | popping 2.diff | |
|
56 | patch queue now empty | |
|
57 | % qimport -e | |
|
58 | adding 2.diff to series file | |
|
59 | % qimport -e --name newname oldexisitingpatch | |
|
60 | renaming 2.diff to this-name-is-better | |
|
61 | adding this-name-is-better to series file | |
|
62 | this-name-is-better | |
|
63 | url.diff |
General Comments 0
You need to be logged in to leave comments.
Login now