Show More
@@ -919,13 +919,13 b' class queue:' | |||||
919 | return 1 |
|
919 | return 1 | |
920 | wlock = repo.wlock() |
|
920 | wlock = repo.wlock() | |
921 | self.check_toppatch(repo) |
|
921 | self.check_toppatch(repo) | |
922 | (top, patch) = (self.applied[-1].rev, self.applied[-1].name) |
|
922 | (top, patchfn) = (self.applied[-1].rev, self.applied[-1].name) | |
923 | top = revlog.bin(top) |
|
923 | top = revlog.bin(top) | |
924 | cparents = repo.changelog.parents(top) |
|
924 | cparents = repo.changelog.parents(top) | |
925 | patchparent = self.qparents(repo, top) |
|
925 | patchparent = self.qparents(repo, top) | |
926 | message, comments, user, date, patchfound = self.readheaders(patch) |
|
926 | message, comments, user, date, patchfound = self.readheaders(patchfn) | |
927 |
|
927 | |||
928 | patchf = self.opener(patch, "w") |
|
928 | patchf = self.opener(patchfn, "w") | |
929 | msg = opts.get('msg', '').rstrip() |
|
929 | msg = opts.get('msg', '').rstrip() | |
930 | if msg: |
|
930 | if msg: | |
931 | if comments: |
|
931 | if comments: | |
@@ -995,8 +995,9 b' class queue:' | |||||
995 | r = list(util.unique(dd)) |
|
995 | r = list(util.unique(dd)) | |
996 | a = list(util.unique(aa)) |
|
996 | a = list(util.unique(aa)) | |
997 | filelist = filter(matchfn, util.unique(m + r + a)) |
|
997 | filelist = filter(matchfn, util.unique(m + r + a)) | |
998 |
|
|
998 | patch.diff(repo, patchparent, files=filelist, match=matchfn, | |
999 |
|
|
999 | fp=patchf, changes=(m, a, r, [], u), | |
|
1000 | opts=self.diffopts()) | |||
1000 | patchf.close() |
|
1001 | patchf.close() | |
1001 |
|
1002 | |||
1002 | changes = repo.changelog.read(tip) |
|
1003 | changes = repo.changelog.read(tip) | |
@@ -1019,7 +1020,7 b' class queue:' | |||||
1019 |
|
1020 | |||
1020 | if not msg: |
|
1021 | if not msg: | |
1021 | if not message: |
|
1022 | if not message: | |
1022 | message = "patch queue: %s\n" % patch |
|
1023 | message = "patch queue: %s\n" % patchfn | |
1023 | else: |
|
1024 | else: | |
1024 | message = "\n".join(message) |
|
1025 | message = "\n".join(message) | |
1025 | else: |
|
1026 | else: | |
@@ -1027,7 +1028,7 b' class queue:' | |||||
1027 |
|
1028 | |||
1028 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
|
1029 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) | |
1029 | n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) |
|
1030 | n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock) | |
1030 | self.applied[-1] = statusentry(revlog.hex(n), patch) |
|
1031 | self.applied[-1] = statusentry(revlog.hex(n), patchfn) | |
1031 | self.applied_dirty = 1 |
|
1032 | self.applied_dirty = 1 | |
1032 | else: |
|
1033 | else: | |
1033 | self.printdiff(repo, patchparent, fp=patchf) |
|
1034 | self.printdiff(repo, patchparent, fp=patchf) |
@@ -126,6 +126,27 b' hg ci -Ama' | |||||
126 | hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
|
126 | hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' | |
127 | hg unbundle .hg/strip-backup/* |
|
127 | hg unbundle .hg/strip-backup/* | |
128 |
|
128 | |||
|
129 | echo '% cd b; hg qrefresh' | |||
|
130 | hg init refresh | |||
|
131 | cd refresh | |||
|
132 | echo a > a | |||
|
133 | hg ci -Ama -d'0 0' | |||
|
134 | hg qnew -mfoo foo | |||
|
135 | echo a >> a | |||
|
136 | hg qrefresh | |||
|
137 | mkdir b | |||
|
138 | cd b | |||
|
139 | echo f > f | |||
|
140 | hg add f | |||
|
141 | hg qrefresh | |||
|
142 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |||
|
143 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo | |||
|
144 | echo % hg qrefresh . | |||
|
145 | hg qrefresh . | |||
|
146 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |||
|
147 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo | |||
|
148 | hg status | |||
|
149 | ||||
129 | cat >>$HGRCPATH <<EOF |
|
150 | cat >>$HGRCPATH <<EOF | |
130 | [diff] |
|
151 | [diff] | |
131 | git = True |
|
152 | git = True |
@@ -127,6 +127,30 b' adding manifests' | |||||
127 | adding file changes |
|
127 | adding file changes | |
128 | added 1 changesets with 1 changes to 1 files |
|
128 | added 1 changesets with 1 changes to 1 files | |
129 | (run 'hg update' to get a working copy) |
|
129 | (run 'hg update' to get a working copy) | |
|
130 | % cd b; hg qrefresh | |||
|
131 | adding a | |||
|
132 | foo | |||
|
133 | ||||
|
134 | diff -r cb9a9f314b8b a | |||
|
135 | --- a/a | |||
|
136 | +++ b/a | |||
|
137 | @@ -1,1 +1,2 @@ a | |||
|
138 | a | |||
|
139 | +a | |||
|
140 | diff -r cb9a9f314b8b b/f | |||
|
141 | --- /dev/null | |||
|
142 | +++ b/b/f | |||
|
143 | @@ -0,0 +1,1 @@ | |||
|
144 | +f | |||
|
145 | % hg qrefresh . | |||
|
146 | foo | |||
|
147 | ||||
|
148 | diff -r cb9a9f314b8b b/f | |||
|
149 | --- /dev/null | |||
|
150 | +++ b/b/f | |||
|
151 | @@ -0,0 +1,1 @@ | |||
|
152 | +f | |||
|
153 | M a | |||
130 | new file |
|
154 | new file | |
131 |
|
155 | |||
132 | diff --git a/new b/new |
|
156 | diff --git a/new b/new |
General Comments 0
You need to be logged in to leave comments.
Login now