##// END OF EJS Templates
patchbomb: don't honor whitespace and format-changing diffopts (BC)...
Siddharth Agarwal -
r23450:a074eeea default
parent child Browse files
Show More
@@ -166,7 +166,7 b' def _getpatches(repo, revs, **opts):'
166 'uncommitted changes\n'))
166 'uncommitted changes\n'))
167 output = cStringIO.StringIO()
167 output = cStringIO.StringIO()
168 cmdutil.export(repo, [r], fp=output,
168 cmdutil.export(repo, [r], fp=output,
169 opts=patch.diffopts(ui, opts))
169 opts=patch.difffeatureopts(ui, opts, git=True))
170 yield output.getvalue().split('\n')
170 yield output.getvalue().split('\n')
171 def _getbundle(repo, dest, **opts):
171 def _getbundle(repo, dest, **opts):
172 """return a bundle containing changesets missing in "dest"
172 """return a bundle containing changesets missing in "dest"
@@ -86,6 +86,80 b' Mercurial-patchbomb/.* -> Mercurial-patc'
86 abort: patchbomb canceled
86 abort: patchbomb canceled
87 [255]
87 [255]
88
88
89 Test diff.git is respected
90 $ hg --config diff.git=True email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -r tip
91 this patch series consists of 1 patches.
92
93
94 displaying [PATCH] a ...
95 Content-Type: text/plain; charset="us-ascii"
96 MIME-Version: 1.0
97 Content-Transfer-Encoding: 7bit
98 Subject: [PATCH] a
99 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
100 X-Mercurial-Series-Index: 1
101 X-Mercurial-Series-Total: 1
102 Message-Id: <8580ff50825a50c8f716.60@*> (glob)
103 X-Mercurial-Series-Id: <8580ff50825a50c8f716.60@*> (glob)
104 User-Agent: Mercurial-patchbomb/* (glob)
105 Date: Thu, 01 Jan 1970 00:01:00 +0000
106 From: quux
107 To: foo
108 Cc: bar
109
110 # HG changeset patch
111 # User test
112 # Date 1 0
113 # Thu Jan 01 00:00:01 1970 +0000
114 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
115 # Parent 0000000000000000000000000000000000000000
116 a
117
118 diff --git a/a b/a
119 new file mode 100644
120 --- /dev/null
121 +++ b/a
122 @@ -0,0 +1,1 @@
123 +a
124
125
126
127 Test breaking format changes aren't
128 $ hg --config diff.noprefix=True email --date '1970-1-1 0:1' -n -f quux -t foo -c bar -r tip
129 this patch series consists of 1 patches.
130
131
132 displaying [PATCH] a ...
133 Content-Type: text/plain; charset="us-ascii"
134 MIME-Version: 1.0
135 Content-Transfer-Encoding: 7bit
136 Subject: [PATCH] a
137 X-Mercurial-Node: 8580ff50825a50c8f716709acdf8de0deddcd6ab
138 X-Mercurial-Series-Index: 1
139 X-Mercurial-Series-Total: 1
140 Message-Id: <8580ff50825a50c8f716.60@*> (glob)
141 X-Mercurial-Series-Id: <8580ff50825a50c8f716.60@*> (glob)
142 User-Agent: Mercurial-patchbomb/* (glob)
143 Date: Thu, 01 Jan 1970 00:01:00 +0000
144 From: quux
145 To: foo
146 Cc: bar
147
148 # HG changeset patch
149 # User test
150 # Date 1 0
151 # Thu Jan 01 00:00:01 1970 +0000
152 # Node ID 8580ff50825a50c8f716709acdf8de0deddcd6ab
153 # Parent 0000000000000000000000000000000000000000
154 a
155
156 diff -r 000000000000 -r 8580ff50825a a
157 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
158 +++ b/a Thu Jan 01 00:00:01 1970 +0000
159 @@ -0,0 +1,1 @@
160 +a
161
162
89 $ echo b > b
163 $ echo b > b
90 $ hg commit -Amb -d '2 0'
164 $ hg commit -Amb -d '2 0'
91 adding b
165 adding b
General Comments 0
You need to be logged in to leave comments. Login now