Show More
@@ -95,7 +95,7 b' def draw_edges(edges, nodeline, interlin' | |||||
95 | else: |
|
95 | else: | |
96 | nodeline[2 * end] = "+" |
|
96 | nodeline[2 * end] = "+" | |
97 | if start > end: |
|
97 | if start > end: | |
98 | (start, end) = (end,start) |
|
98 | (start, end) = (end, start) | |
99 | for i in range(2 * start + 1, 2 * end): |
|
99 | for i in range(2 * start + 1, 2 * end): | |
100 | if nodeline[i] != "+": |
|
100 | if nodeline[i] != "+": | |
101 | nodeline[i] = "-" |
|
101 | nodeline[i] = "-" |
@@ -1850,7 +1850,7 b' def prev(ui, repo, **opts):' | |||||
1850 | summary=opts.get('summary')) |
|
1850 | summary=opts.get('summary')) | |
1851 |
|
1851 | |||
1852 | def setupheaderopts(ui, opts): |
|
1852 | def setupheaderopts(ui, opts): | |
1853 | def do(opt,val): |
|
1853 | def do(opt, val): | |
1854 | if not opts[opt] and opts['current' + opt]: |
|
1854 | if not opts[opt] and opts['current' + opt]: | |
1855 | opts[opt] = val |
|
1855 | opts[opt] = val | |
1856 | do('user', ui.username()) |
|
1856 | do('user', ui.username()) |
@@ -160,7 +160,7 b' class bundlerepository(localrepo.localre' | |||||
160 | localrepo.localrepository.__init__(self, ui, path) |
|
160 | localrepo.localrepository.__init__(self, ui, path) | |
161 | except error.RepoError: |
|
161 | except error.RepoError: | |
162 | self._tempparent = tempfile.mkdtemp() |
|
162 | self._tempparent = tempfile.mkdtemp() | |
163 | localrepo.instance(ui,self._tempparent,1) |
|
163 | localrepo.instance(ui, self._tempparent, 1) | |
164 | localrepo.localrepository.__init__(self, ui, self._tempparent) |
|
164 | localrepo.localrepository.__init__(self, ui, self._tempparent) | |
165 |
|
165 | |||
166 | if path: |
|
166 | if path: |
@@ -663,9 +663,9 b' def commit(ui, repo, *pats, **opts):' | |||||
663 | ui.status(_('created new head\n')) |
|
663 | ui.status(_('created new head\n')) | |
664 |
|
664 | |||
665 | if ui.debugflag: |
|
665 | if ui.debugflag: | |
666 | ui.write(_('committed changeset %d:%s\n') % (rev,hex(node))) |
|
666 | ui.write(_('committed changeset %d:%s\n') % (rev, hex(node))) | |
667 | elif ui.verbose: |
|
667 | elif ui.verbose: | |
668 | ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) |
|
668 | ui.write(_('committed changeset %d:%s\n') % (rev, short(node))) | |
669 |
|
669 | |||
670 | def copy(ui, repo, *pats, **opts): |
|
670 | def copy(ui, repo, *pats, **opts): | |
671 | """mark files as copied for the next commit |
|
671 | """mark files as copied for the next commit |
@@ -26,7 +26,7 b' def lookup(repo, req):' | |||||
26 | try: |
|
26 | try: | |
27 | r = hex(repo.lookup(req.form['key'][0])) |
|
27 | r = hex(repo.lookup(req.form['key'][0])) | |
28 | success = 1 |
|
28 | success = 1 | |
29 | except Exception,inst: |
|
29 | except Exception, inst: | |
30 | r = str(inst) |
|
30 | r = str(inst) | |
31 | success = 0 |
|
31 | success = 0 | |
32 | resp = "%s %s\n" % (success, r) |
|
32 | resp = "%s %s\n" % (success, r) |
@@ -339,7 +339,7 b' def tags(web, req, tmpl):' | |||||
339 | i.reverse() |
|
339 | i.reverse() | |
340 | parity = paritygen(web.stripecount) |
|
340 | parity = paritygen(web.stripecount) | |
341 |
|
341 | |||
342 | def entries(notip=False,limit=0, **map): |
|
342 | def entries(notip=False, limit=0, **map): | |
343 | count = 0 |
|
343 | count = 0 | |
344 | for k, n in i: |
|
344 | for k, n in i: | |
345 | if notip and k == "tip": |
|
345 | if notip and k == "tip": |
@@ -59,7 +59,7 b' class sshserver(object):' | |||||
59 | try: |
|
59 | try: | |
60 | r = hex(self.repo.lookup(key)) |
|
60 | r = hex(self.repo.lookup(key)) | |
61 | success = 1 |
|
61 | success = 1 | |
62 | except Exception,inst: |
|
62 | except Exception, inst: | |
63 | r = str(inst) |
|
63 | r = str(inst) | |
64 | success = 0 |
|
64 | success = 0 | |
65 | self.respond("%s %s\n" % (success, r)) |
|
65 | self.respond("%s %s\n" % (success, r)) |
@@ -78,7 +78,7 b' def _verify(repo):' | |||||
78 | msg = _("rev %d points to unexpected changeset %d") |
|
78 | msg = _("rev %d points to unexpected changeset %d") | |
79 | err(None, msg % (i, lr), f) |
|
79 | err(None, msg % (i, lr), f) | |
80 | if linkrevs: |
|
80 | if linkrevs: | |
81 | warn(_(" (expected %s)") % " ".join(map(str,linkrevs))) |
|
81 | warn(_(" (expected %s)") % " ".join(map(str, linkrevs))) | |
82 | lr = None # can't be trusted |
|
82 | lr = None # can't be trusted | |
83 |
|
83 | |||
84 | try: |
|
84 | try: |
@@ -18,7 +18,7 b' import win32api' | |||||
18 | import errno, os, sys, pywintypes, win32con, win32file, win32process |
|
18 | import errno, os, sys, pywintypes, win32con, win32file, win32process | |
19 | import winerror |
|
19 | import winerror | |
20 | import osutil, encoding |
|
20 | import osutil, encoding | |
21 | from win32com.shell import shell,shellcon |
|
21 | from win32com.shell import shell, shellcon | |
22 |
|
22 | |||
23 | def os_link(src, dst): |
|
23 | def os_link(src, dst): | |
24 | try: |
|
24 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now