Show More
@@ -284,7 +284,7 b' class gnuarch_source(converter_source, c' | |||||
284 | self.changes[rev].summary = self.recode(self.changes[rev].summary) |
|
284 | self.changes[rev].summary = self.recode(self.changes[rev].summary) | |
285 |
|
285 | |||
286 | # Commit revision origin when dealing with a branch or tag |
|
286 | # Commit revision origin when dealing with a branch or tag | |
287 |
if |
|
287 | if 'Continuation-of' in catlog: | |
288 | self.changes[rev].continuationof = self.recode(catlog['Continuation-of']) |
|
288 | self.changes[rev].continuationof = self.recode(catlog['Continuation-of']) | |
289 | except Exception: |
|
289 | except Exception: | |
290 | raise util.Abort(_('could not parse cat-log of %s') % rev) |
|
290 | raise util.Abort(_('could not parse cat-log of %s') % rev) |
@@ -101,7 +101,7 b' def wrapperforlistdir(func, args, kwds):' | |||||
101 | if args: |
|
101 | if args: | |
102 | args = list(args) |
|
102 | args = list(args) | |
103 | args[0] = appendsep(args[0]) |
|
103 | args[0] = appendsep(args[0]) | |
104 | if kwds.has_key('path'): |
|
104 | if 'path' in kwds: | |
105 | kwds['path'] = appendsep(kwds['path']) |
|
105 | kwds['path'] = appendsep(kwds['path']) | |
106 | return func(*args, **kwds) |
|
106 | return func(*args, **kwds) | |
107 |
|
107 |
@@ -1323,11 +1323,11 b' def grep(ui, repo, pattern, *pats, **opt' | |||||
1323 | continue |
|
1323 | continue | |
1324 | files.append(fn) |
|
1324 | files.append(fn) | |
1325 |
|
1325 | |||
1326 |
if not matches[rev] |
|
1326 | if fn not in matches[rev]: | |
1327 | grepbody(fn, rev, flog.read(fnode)) |
|
1327 | grepbody(fn, rev, flog.read(fnode)) | |
1328 |
|
1328 | |||
1329 | pfn = copy or fn |
|
1329 | pfn = copy or fn | |
1330 |
if not matches[parent] |
|
1330 | if pfn not in matches[parent]: | |
1331 | try: |
|
1331 | try: | |
1332 | fnode = pctx.filenode(pfn) |
|
1332 | fnode = pctx.filenode(pfn) | |
1333 | grepbody(pfn, parent, flog.read(fnode)) |
|
1333 | grepbody(pfn, parent, flog.read(fnode)) |
General Comments 0
You need to be logged in to leave comments.
Login now