changeset 1038:5f191561a061

Merge with MPM.
author bos@eng-25.internal.keyresearch.com
date Wed, 24 Aug 2005 14:46:02 -0700
parents c0a1abf562eb (diff) 7c00f5f2c967 (current diff)
children 4296754ba7b4
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Aug 24 14:24:20 2005 -0700
+++ b/mercurial/commands.py	Wed Aug 24 14:46:02 2005 -0700
@@ -845,7 +845,12 @@
     # performance, so we use iterators that walk forwards through
     # windows of revisions, yielding revisions in reverse order, while
     # walking the windows backwards.
-    files, matchfn, anypats = matchpats(repo, repo.getcwd(), pats, opts)
+    cwd = repo.getcwd()
+    if not pats and cwd:
+        opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
+        opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
+    files, matchfn, anypats = matchpats(repo, (pats and cwd) or '',
+                                        pats, opts)
     revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
     wanted = {}
     slowpath = anypats