--- a/mercurial/commands.py Thu Nov 24 11:38:16 2011 +0100
+++ b/mercurial/commands.py Sat Nov 26 00:10:12 2011 +0100
@@ -3263,10 +3263,11 @@
('i', 'id', None, _('show global revision id')),
('b', 'branch', None, _('show branch')),
('t', 'tags', None, _('show tags')),
- ('B', 'bookmarks', None, _('show bookmarks'))],
+ ('B', 'bookmarks', None, _('show bookmarks')),
+ ] + remoteopts,
_('[-nibtB] [-r REV] [SOURCE]'))
def identify(ui, repo, source=None, rev=None,
- num=None, id=None, branch=None, tags=None, bookmarks=None):
+ num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
"""identify the working copy or specified revision
Print a summary identifying the repository state at REV using one or
@@ -3310,7 +3311,7 @@
if source:
source, branches = hg.parseurl(ui.expandpath(source))
- repo = hg.peer(ui, {}, source)
+ repo = hg.peer(ui, opts, source)
revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
if not repo.local():
--- a/tests/test-debugcomplete.t Thu Nov 24 11:38:16 2011 +0100
+++ b/tests/test-debugcomplete.t Sat Nov 26 00:10:12 2011 +0100
@@ -247,7 +247,7 @@
grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, include, exclude
heads: rev, topo, active, closed, style, template
help: extension, command
- identify: rev, num, id, branch, tags, bookmarks
+ identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure
import: strip, base, edit, force, no-commit, bypass, exact, import-branch, message, logfile, date, user, similarity
incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
locate: rev, print0, fullpath, include, exclude
--- a/tests/test-hook.t Thu Nov 24 11:38:16 2011 +0100
+++ b/tests/test-hook.t Sat Nov 26 00:10:12 2011 +0100
@@ -68,7 +68,7 @@
test generic hooks
$ hg id
- pre-identify hook: HG_ARGS=id HG_OPTS={'bookmarks': None, 'branch': None, 'id': None, 'num': None, 'rev': '', 'tags': None} HG_PATS=[]
+ pre-identify hook: HG_ARGS=id HG_OPTS={'bookmarks': None, 'branch': None, 'id': None, 'insecure': None, 'num': None, 'remotecmd': '', 'rev': '', 'ssh': '', 'tags': None} HG_PATS=[]
warning: pre-identify hook exited with status 1
[1]
$ hg cat b