Show More
@@ -95,9 +95,9 b' except ImportError:' | |||||
95 | 'diff.inserted': 'green', |
|
95 | 'diff.inserted': 'green', | |
96 | 'diff.tab': '', |
|
96 | 'diff.tab': '', | |
97 | 'diff.trailingwhitespace': 'bold red_background', |
|
97 | 'diff.trailingwhitespace': 'bold red_background', | |
98 |
'changeset.public' |
|
98 | 'changeset.public': '', | |
99 |
'changeset.draft' |
|
99 | 'changeset.draft': '', | |
100 |
'changeset.secret' |
|
100 | 'changeset.secret': '', | |
101 | 'diffstat.deleted': 'red', |
|
101 | 'diffstat.deleted': 'red', | |
102 | 'diffstat.inserted': 'green', |
|
102 | 'diffstat.inserted': 'green', | |
103 | 'histedit.remaining': 'red bold', |
|
103 | 'histedit.remaining': 'red bold', |
@@ -272,8 +272,8 b' class server(object):' | |||||
272 |
|
272 | |||
273 | return cmd != '' |
|
273 | return cmd != '' | |
274 |
|
274 | |||
275 |
capabilities = {'runcommand' |
|
275 | capabilities = {'runcommand': runcommand, | |
276 |
'getencoding' |
|
276 | 'getencoding': getencoding} | |
277 |
|
277 | |||
278 | def serve(self): |
|
278 | def serve(self): | |
279 | hellomsg = 'capabilities: ' + ' '.join(sorted(self.capabilities)) |
|
279 | hellomsg = 'capabilities: ' + ' '.join(sorted(self.capabilities)) |
@@ -243,10 +243,10 b' def _runcatch(req):' | |||||
243 | try: |
|
243 | try: | |
244 | debugger = 'pdb' |
|
244 | debugger = 'pdb' | |
245 | debugtrace = { |
|
245 | debugtrace = { | |
246 |
'pdb' |
|
246 | 'pdb': pdb.set_trace | |
247 | } |
|
247 | } | |
248 | debugmortem = { |
|
248 | debugmortem = { | |
249 |
'pdb' |
|
249 | 'pdb': pdb.post_mortem | |
250 | } |
|
250 | } | |
251 |
|
251 | |||
252 | # read --config before doing anything else |
|
252 | # read --config before doing anything else |
@@ -320,7 +320,7 b' class hgwebdir(object):' | |||||
320 | for typ, spec in hgweb_mod.archivespecs.iteritems(): |
|
320 | for typ, spec in hgweb_mod.archivespecs.iteritems(): | |
321 | if typ in allowed or ui.configbool("web", "allow" + typ, |
|
321 | if typ in allowed or ui.configbool("web", "allow" + typ, | |
322 | untrusted=True): |
|
322 | untrusted=True): | |
323 |
archives.append({"type" |
|
323 | archives.append({"type": typ, "extension": spec[2], | |
324 | "node": nodeid, "url": url}) |
|
324 | "node": nodeid, "url": url}) | |
325 | return archives |
|
325 | return archives | |
326 |
|
326 |
@@ -87,4 +87,4 b' def launch(application):' | |||||
87 | if not headers_sent: |
|
87 | if not headers_sent: | |
88 | write('') # send headers now if body was empty |
|
88 | write('') # send headers now if body was empty | |
89 | finally: |
|
89 | finally: | |
90 |
getattr(content, 'close', lambda |
|
90 | getattr(content, 'close', lambda: None)() |
@@ -151,7 +151,7 b' class httppeer(wireproto.wirepeer):' | |||||
151 | if urlopener: |
|
151 | if urlopener: | |
152 | for h in urlopener.handlers: |
|
152 | for h in urlopener.handlers: | |
153 | h.close() |
|
153 | h.close() | |
154 |
getattr(h, "close_all", lambda |
|
154 | getattr(h, "close_all", lambda: None)() | |
155 |
|
155 | |||
156 | # Begin of _basepeer interface. |
|
156 | # Begin of _basepeer interface. | |
157 |
|
157 |
@@ -419,7 +419,7 b' class mergestate(object):' | |||||
419 | fca.path(), hex(fca.filenode()), |
|
419 | fca.path(), hex(fca.filenode()), | |
420 | fco.path(), hex(fco.filenode()), |
|
420 | fco.path(), hex(fco.filenode()), | |
421 | fcl.flags()] |
|
421 | fcl.flags()] | |
422 |
self._stateextras[fd] = { |
|
422 | self._stateextras[fd] = {'ancestorlinknode': hex(fca.node())} | |
423 | self._dirty = True |
|
423 | self._dirty = True | |
424 |
|
424 | |||
425 | def __contains__(self, dfile): |
|
425 | def __contains__(self, dfile): | |
@@ -864,7 +864,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
864 | fla = ma.flags(f) |
|
864 | fla = ma.flags(f) | |
865 | nol = 'l' not in fl1 + fl2 + fla |
|
865 | nol = 'l' not in fl1 + fl2 + fla | |
866 | if n2 == a and fl2 == fla: |
|
866 | if n2 == a and fl2 == fla: | |
867 |
actions[f] = ('k' |
|
867 | actions[f] = ('k', (), "remote unchanged") | |
868 | elif n1 == a and fl1 == fla: # local unchanged - use remote |
|
868 | elif n1 == a and fl1 == fla: # local unchanged - use remote | |
869 | if n1 == n2: # optimization: keep local content |
|
869 | if n1 == n2: # optimization: keep local content | |
870 | actions[f] = ('e', (fl2,), "update permissions") |
|
870 | actions[f] = ('e', (fl2,), "update permissions") |
@@ -174,7 +174,7 b' class progbar(object):' | |||||
174 | amt -= progwidth |
|
174 | amt -= progwidth | |
175 | bar = (' ' * int(progwidth - abs(amt)) + '<=>' + |
|
175 | bar = (' ' * int(progwidth - abs(amt)) + '<=>' + | |
176 | ' ' * int(abs(amt))) |
|
176 | ' ' * int(abs(amt))) | |
177 |
prog = ''.join(('[', bar |
|
177 | prog = ''.join(('[', bar, ']')) | |
178 | out = spacejoin(head, prog, tail) |
|
178 | out = spacejoin(head, prog, tail) | |
179 | else: |
|
179 | else: | |
180 | out = spacejoin(head, tail) |
|
180 | out = spacejoin(head, tail) |
General Comments 0
You need to be logged in to leave comments.
Login now