##// END OF EJS Templates
diffhelpers: use absolute_import
Gregory Szorc -
r27336:80214358 default
parent child Browse files
Show More
@@ -1,60 +1,62 b''
1 1 # diffhelpers.py - pure Python implementation of diffhelpers.c
2 2 #
3 3 # Copyright 2009 Matt Mackall <mpm@selenic.com> and others
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 from __future__ import absolute_import
9
8 10 def addlines(fp, hunk, lena, lenb, a, b):
9 11 while True:
10 12 todoa = lena - len(a)
11 13 todob = lenb - len(b)
12 14 num = max(todoa, todob)
13 15 if num == 0:
14 16 break
15 17 for i in xrange(num):
16 18 s = fp.readline()
17 19 c = s[0]
18 20 if s == "\\ No newline at end of file\n":
19 21 fix_newline(hunk, a, b)
20 22 continue
21 23 if c == "\n":
22 24 # Some patches may be missing the control char
23 25 # on empty lines. Supply a leading space.
24 26 s = " \n"
25 27 hunk.append(s)
26 28 if c == "+":
27 29 b.append(s[1:])
28 30 elif c == "-":
29 31 a.append(s)
30 32 else:
31 33 b.append(s[1:])
32 34 a.append(s)
33 35 return 0
34 36
35 37 def fix_newline(hunk, a, b):
36 38 l = hunk[-1]
37 39 # tolerate CRLF in last line
38 40 if l.endswith('\r\n'):
39 41 hline = l[:-2]
40 42 else:
41 43 hline = l[:-1]
42 44 c = hline[0]
43 45
44 46 if c in " +":
45 47 b[-1] = hline[1:]
46 48 if c in " -":
47 49 a[-1] = hline
48 50 hunk[-1] = hline
49 51 return 0
50 52
51 53
52 54 def testhunk(a, b, bstart):
53 55 alen = len(a)
54 56 blen = len(b)
55 57 if alen > blen - bstart:
56 58 return -1
57 59 for i in xrange(alen):
58 60 if a[i][1:] != b[i + bstart]:
59 61 return -1
60 62 return 0
@@ -1,217 +1,216 b''
1 1 #require test-repo
2 2
3 3 $ cd "$TESTDIR"/..
4 4
5 5 $ hg files 'set:(**.py)' | xargs python contrib/check-py3-compat.py
6 6 contrib/casesmash.py not using absolute_import
7 7 contrib/check-code.py not using absolute_import
8 8 contrib/check-code.py requires print_function
9 9 contrib/check-config.py not using absolute_import
10 10 contrib/check-config.py requires print_function
11 11 contrib/debugcmdserver.py not using absolute_import
12 12 contrib/debugcmdserver.py requires print_function
13 13 contrib/debugshell.py not using absolute_import
14 14 contrib/fixpax.py not using absolute_import
15 15 contrib/fixpax.py requires print_function
16 16 contrib/hgclient.py not using absolute_import
17 17 contrib/hgclient.py requires print_function
18 18 contrib/hgfixes/fix_bytes.py not using absolute_import
19 19 contrib/hgfixes/fix_bytesmod.py not using absolute_import
20 20 contrib/hgfixes/fix_leftover_imports.py not using absolute_import
21 21 contrib/import-checker.py not using absolute_import
22 22 contrib/import-checker.py requires print_function
23 23 contrib/memory.py not using absolute_import
24 24 contrib/perf.py not using absolute_import
25 25 contrib/python-hook-examples.py not using absolute_import
26 26 contrib/revsetbenchmarks.py not using absolute_import
27 27 contrib/revsetbenchmarks.py requires print_function
28 28 contrib/showstack.py not using absolute_import
29 29 contrib/synthrepo.py not using absolute_import
30 30 contrib/win32/hgwebdir_wsgi.py not using absolute_import
31 31 doc/check-seclevel.py not using absolute_import
32 32 doc/gendoc.py not using absolute_import
33 33 doc/hgmanpage.py not using absolute_import
34 34 hgext/__init__.py not using absolute_import
35 35 hgext/acl.py not using absolute_import
36 36 hgext/blackbox.py not using absolute_import
37 37 hgext/bugzilla.py not using absolute_import
38 38 hgext/censor.py not using absolute_import
39 39 hgext/children.py not using absolute_import
40 40 hgext/churn.py not using absolute_import
41 41 hgext/clonebundles.py not using absolute_import
42 42 hgext/color.py not using absolute_import
43 43 hgext/convert/__init__.py not using absolute_import
44 44 hgext/convert/bzr.py not using absolute_import
45 45 hgext/convert/common.py not using absolute_import
46 46 hgext/convert/convcmd.py not using absolute_import
47 47 hgext/convert/cvs.py not using absolute_import
48 48 hgext/convert/cvsps.py not using absolute_import
49 49 hgext/convert/darcs.py not using absolute_import
50 50 hgext/convert/filemap.py not using absolute_import
51 51 hgext/convert/git.py not using absolute_import
52 52 hgext/convert/gnuarch.py not using absolute_import
53 53 hgext/convert/hg.py not using absolute_import
54 54 hgext/convert/monotone.py not using absolute_import
55 55 hgext/convert/p4.py not using absolute_import
56 56 hgext/convert/subversion.py not using absolute_import
57 57 hgext/convert/transport.py not using absolute_import
58 58 hgext/eol.py not using absolute_import
59 59 hgext/extdiff.py not using absolute_import
60 60 hgext/factotum.py not using absolute_import
61 61 hgext/fetch.py not using absolute_import
62 62 hgext/gpg.py not using absolute_import
63 63 hgext/graphlog.py not using absolute_import
64 64 hgext/hgcia.py not using absolute_import
65 65 hgext/hgk.py not using absolute_import
66 66 hgext/highlight/__init__.py not using absolute_import
67 67 hgext/highlight/highlight.py not using absolute_import
68 68 hgext/histedit.py not using absolute_import
69 69 hgext/keyword.py not using absolute_import
70 70 hgext/largefiles/__init__.py not using absolute_import
71 71 hgext/largefiles/basestore.py not using absolute_import
72 72 hgext/largefiles/lfcommands.py not using absolute_import
73 73 hgext/largefiles/lfutil.py not using absolute_import
74 74 hgext/largefiles/localstore.py not using absolute_import
75 75 hgext/largefiles/overrides.py not using absolute_import
76 76 hgext/largefiles/proto.py not using absolute_import
77 77 hgext/largefiles/remotestore.py not using absolute_import
78 78 hgext/largefiles/reposetup.py not using absolute_import
79 79 hgext/largefiles/uisetup.py not using absolute_import
80 80 hgext/largefiles/wirestore.py not using absolute_import
81 81 hgext/mq.py not using absolute_import
82 82 hgext/notify.py not using absolute_import
83 83 hgext/pager.py not using absolute_import
84 84 hgext/patchbomb.py not using absolute_import
85 85 hgext/purge.py not using absolute_import
86 86 hgext/rebase.py not using absolute_import
87 87 hgext/record.py not using absolute_import
88 88 hgext/relink.py not using absolute_import
89 89 hgext/schemes.py not using absolute_import
90 90 hgext/share.py not using absolute_import
91 91 hgext/shelve.py not using absolute_import
92 92 hgext/strip.py not using absolute_import
93 93 hgext/transplant.py not using absolute_import
94 94 hgext/win32mbcs.py not using absolute_import
95 95 hgext/win32text.py not using absolute_import
96 96 hgext/zeroconf/Zeroconf.py not using absolute_import
97 97 hgext/zeroconf/Zeroconf.py requires print_function
98 98 hgext/zeroconf/__init__.py not using absolute_import
99 99 i18n/check-translation.py not using absolute_import
100 100 i18n/polib.py not using absolute_import
101 101 mercurial/byterange.py not using absolute_import
102 102 mercurial/cmdutil.py not using absolute_import
103 103 mercurial/commands.py not using absolute_import
104 104 mercurial/commandserver.py not using absolute_import
105 105 mercurial/context.py not using absolute_import
106 106 mercurial/dirstate.py not using absolute_import
107 107 mercurial/dispatch.py requires print_function
108 108 mercurial/encoding.py not using absolute_import
109 109 mercurial/exchange.py not using absolute_import
110 110 mercurial/help.py not using absolute_import
111 111 mercurial/httpclient/__init__.py not using absolute_import
112 112 mercurial/httpclient/_readers.py not using absolute_import
113 113 mercurial/httpclient/socketutil.py not using absolute_import
114 114 mercurial/httpconnection.py not using absolute_import
115 115 mercurial/keepalive.py not using absolute_import
116 116 mercurial/keepalive.py requires print_function
117 117 mercurial/localrepo.py not using absolute_import
118 118 mercurial/lsprof.py requires print_function
119 119 mercurial/lsprofcalltree.py not using absolute_import
120 120 mercurial/lsprofcalltree.py requires print_function
121 121 mercurial/mail.py requires print_function
122 122 mercurial/manifest.py not using absolute_import
123 123 mercurial/mdiff.py not using absolute_import
124 124 mercurial/patch.py not using absolute_import
125 mercurial/pure/diffhelpers.py not using absolute_import
126 125 mercurial/pure/mpatch.py not using absolute_import
127 126 mercurial/pure/osutil.py not using absolute_import
128 127 mercurial/pure/parsers.py not using absolute_import
129 128 mercurial/pvec.py not using absolute_import
130 129 mercurial/py3kcompat.py not using absolute_import
131 130 mercurial/revlog.py not using absolute_import
132 131 mercurial/scmposix.py not using absolute_import
133 132 mercurial/scmutil.py not using absolute_import
134 133 mercurial/scmwindows.py not using absolute_import
135 134 mercurial/similar.py not using absolute_import
136 135 mercurial/store.py not using absolute_import
137 136 mercurial/util.py not using absolute_import
138 137 mercurial/windows.py not using absolute_import
139 138 setup.py not using absolute_import
140 139 tests/filterpyflakes.py requires print_function
141 140 tests/generate-working-copy-states.py requires print_function
142 141 tests/get-with-headers.py requires print_function
143 142 tests/heredoctest.py requires print_function
144 143 tests/hypothesishelpers.py not using absolute_import
145 144 tests/hypothesishelpers.py requires print_function
146 145 tests/killdaemons.py not using absolute_import
147 146 tests/md5sum.py not using absolute_import
148 147 tests/mockblackbox.py not using absolute_import
149 148 tests/printenv.py not using absolute_import
150 149 tests/readlink.py not using absolute_import
151 150 tests/readlink.py requires print_function
152 151 tests/revlog-formatv0.py not using absolute_import
153 152 tests/run-tests.py not using absolute_import
154 153 tests/seq.py not using absolute_import
155 154 tests/seq.py requires print_function
156 155 tests/silenttestrunner.py not using absolute_import
157 156 tests/silenttestrunner.py requires print_function
158 157 tests/sitecustomize.py not using absolute_import
159 158 tests/svn-safe-append.py not using absolute_import
160 159 tests/svnxml.py not using absolute_import
161 160 tests/test-ancestor.py requires print_function
162 161 tests/test-atomictempfile.py not using absolute_import
163 162 tests/test-batching.py not using absolute_import
164 163 tests/test-batching.py requires print_function
165 164 tests/test-bdiff.py not using absolute_import
166 165 tests/test-bdiff.py requires print_function
167 166 tests/test-context.py not using absolute_import
168 167 tests/test-context.py requires print_function
169 168 tests/test-demandimport.py not using absolute_import
170 169 tests/test-demandimport.py requires print_function
171 170 tests/test-dispatch.py not using absolute_import
172 171 tests/test-dispatch.py requires print_function
173 172 tests/test-doctest.py not using absolute_import
174 173 tests/test-duplicateoptions.py not using absolute_import
175 174 tests/test-duplicateoptions.py requires print_function
176 175 tests/test-filecache.py not using absolute_import
177 176 tests/test-filecache.py requires print_function
178 177 tests/test-filelog.py not using absolute_import
179 178 tests/test-filelog.py requires print_function
180 179 tests/test-hg-parseurl.py not using absolute_import
181 180 tests/test-hg-parseurl.py requires print_function
182 181 tests/test-hgweb-auth.py not using absolute_import
183 182 tests/test-hgweb-auth.py requires print_function
184 183 tests/test-hgwebdir-paths.py not using absolute_import
185 184 tests/test-hybridencode.py not using absolute_import
186 185 tests/test-hybridencode.py requires print_function
187 186 tests/test-lrucachedict.py not using absolute_import
188 187 tests/test-lrucachedict.py requires print_function
189 188 tests/test-manifest.py not using absolute_import
190 189 tests/test-minirst.py not using absolute_import
191 190 tests/test-minirst.py requires print_function
192 191 tests/test-parseindex2.py not using absolute_import
193 192 tests/test-parseindex2.py requires print_function
194 193 tests/test-pathencode.py not using absolute_import
195 194 tests/test-pathencode.py requires print_function
196 195 tests/test-propertycache.py not using absolute_import
197 196 tests/test-propertycache.py requires print_function
198 197 tests/test-revlog-ancestry.py not using absolute_import
199 198 tests/test-revlog-ancestry.py requires print_function
200 199 tests/test-run-tests.py not using absolute_import
201 200 tests/test-simplemerge.py not using absolute_import
202 201 tests/test-status-inprocess.py not using absolute_import
203 202 tests/test-status-inprocess.py requires print_function
204 203 tests/test-symlink-os-yes-fs-no.py not using absolute_import
205 204 tests/test-trusted.py not using absolute_import
206 205 tests/test-trusted.py requires print_function
207 206 tests/test-ui-color.py not using absolute_import
208 207 tests/test-ui-color.py requires print_function
209 208 tests/test-ui-config.py not using absolute_import
210 209 tests/test-ui-config.py requires print_function
211 210 tests/test-ui-verbosity.py not using absolute_import
212 211 tests/test-ui-verbosity.py requires print_function
213 212 tests/test-url.py not using absolute_import
214 213 tests/test-url.py requires print_function
215 214 tests/test-walkrepo.py requires print_function
216 215 tests/test-wireproto.py requires print_function
217 216 tests/tinyproxy.py requires print_function
General Comments 0
You need to be logged in to leave comments. Login now