Show More
@@ -1015,10 +1015,10 b' class queue:' | |||||
1015 | m = util.unique(mm) |
|
1015 | m = util.unique(mm) | |
1016 | r = util.unique(dd) |
|
1016 | r = util.unique(dd) | |
1017 | a = util.unique(aa) |
|
1017 | a = util.unique(aa) | |
1018 |
|
|
1018 | c = [filter(matchfn, l) for l in (m, a, r, [], u)] | |
|
1019 | filelist = util.unique(c[0] + c[1] + c[2]) | |||
1019 | patch.diff(repo, patchparent, files=filelist, match=matchfn, |
|
1020 | patch.diff(repo, patchparent, files=filelist, match=matchfn, | |
1020 |
fp=patchf, changes= |
|
1021 | fp=patchf, changes=c, opts=self.diffopts()) | |
1021 | opts=self.diffopts()) |
|
|||
1022 | patchf.close() |
|
1022 | patchf.close() | |
1023 |
|
1023 | |||
1024 | repo.dirstate.setparents(*cparents) |
|
1024 | repo.dirstate.setparents(*cparents) | |
@@ -1066,7 +1066,8 b' class queue:' | |||||
1066 | message = msg |
|
1066 | message = msg | |
1067 |
|
1067 | |||
1068 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) |
|
1068 | self.strip(repo, top, update=False, backup='strip', wlock=wlock) | |
1069 |
n = repo.commit(filelist, message, changes[1], |
|
1069 | n = repo.commit(filelist, message, changes[1], match=matchfn, | |
|
1070 | force=1, wlock=wlock) | |||
1070 | self.applied[-1] = statusentry(revlog.hex(n), patchfn) |
|
1071 | self.applied[-1] = statusentry(revlog.hex(n), patchfn) | |
1071 | self.applied_dirty = 1 |
|
1072 | self.applied_dirty = 1 | |
1072 | else: |
|
1073 | else: |
@@ -55,6 +55,18 b' sed -e "s/^\\(diff -r \\)\\([a-f0-9]* \\)/\\1' | |||||
55 | -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
55 | -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
56 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch |
|
56 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" .hg/patches/test.patch | |
57 |
|
57 | |||
|
58 | echo % empty qrefresh | |||
|
59 | ||||
|
60 | hg qrefresh -X a | |||
|
61 | echo 'revision:' | |||
|
62 | hg diff -r -2 -r -1 | |||
|
63 | echo 'patch:' | |||
|
64 | cat .hg/patches/test.patch | |||
|
65 | echo 'working dir diff:' | |||
|
66 | hg diff --nodates -q | |||
|
67 | # restore things | |||
|
68 | hg qrefresh | |||
|
69 | ||||
58 | echo % qpop |
|
70 | echo % qpop | |
59 |
|
71 | |||
60 | hg qpop |
|
72 | hg qpop |
@@ -71,6 +71,17 b' diff -r xa' | |||||
71 | @@ -1,1 +1,2 @@ a |
|
71 | @@ -1,1 +1,2 @@ a | |
72 | a |
|
72 | a | |
73 | +a |
|
73 | +a | |
|
74 | % empty qrefresh | |||
|
75 | revision: | |||
|
76 | patch: | |||
|
77 | foo bar | |||
|
78 | ||||
|
79 | working dir diff: | |||
|
80 | --- a/a | |||
|
81 | +++ b/a | |||
|
82 | @@ -1,1 +1,2 @@ a | |||
|
83 | a | |||
|
84 | +a | |||
74 | % qpop |
|
85 | % qpop | |
75 | Patch queue now empty |
|
86 | Patch queue now empty | |
76 | % qpush |
|
87 | % qpush |
General Comments 0
You need to be logged in to leave comments.
Login now