# HG changeset patch # User Augie Fackler # Date 1432912014 14400 # Node ID c7d067c174b8bba942d76c773cacd8e179c55f10 # Parent ecce8aef4b21ec33ebc916fb4aef6c4d440bb02d# Parent 9a78a6524f9d861c1356b56dec102f1e5379bc7c Merge with stable. diff --git a/hgsubversion/__init__.py b/hgsubversion/__init__.py --- a/hgsubversion/__init__.py +++ b/hgsubversion/__init__.py @@ -178,6 +178,9 @@ def reposetup(ui, repo): if ui.configbool('hgsubversion', 'nativerevs'): extensions.wrapfunction(revset, 'stringset', util.revset_stringset) + revset.symbols['stringset'] = revset.stringset + revset.methods['string'] = revset.stringset + revset.methods['symbol'] = revset.stringset _old_local = hg.schemes['file'] def _lookup(url): diff --git a/hgsubversion/util.py b/hgsubversion/util.py --- a/hgsubversion/util.py +++ b/hgsubversion/util.py @@ -227,6 +227,9 @@ class PrefixMatch(object): def anypats(self): return True + def prefix(self): + return False + def outgoing_revisions(repo, reverse_map, sourcerev): """Given a repo and an hg_editor, determines outgoing revisions for the current working copy state.