# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1182444853 18000
# Node ID 48c94bffdb28e332802736313af327b47f8fdab1
# Parent  091c9e54d306bc178b364d33f0efb1f8975ec7f4
identify: add support for output flags

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1432,7 +1432,7 @@ def help_(ui, name=None, with_version=Fa
             else:
                 ui.write("%s\n" % first)
 
-def identify(ui, repo, rev=None):
+def identify(ui, repo, rev=None, num=None, id=None, branch=None, tags=None):
     """identify the working copy or specified revision
 
     With no argument, print a summary of the current state of the repo.
@@ -1444,26 +1444,43 @@ def identify(ui, repo, rev=None):
     """
 
     hexfunc = ui.debugflag and hex or short
+    default = not (num or id or branch or tags)
+    output = []
 
     if not rev:
         ctx = repo.workingctx()
         parents = ctx.parents()
-        changed = ctx.files() + ctx.deleted()
-        output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
-                            (changed) and "+" or "")]
+        changed = False
+        if default or id or num:
+            changed = ctx.files() + ctx.deleted()
+        if default or id:
+            output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
+                                (changed) and "+" or "")]
+        if num:
+            output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
+                                    (changed) and "+" or ""))
     else:
         ctx = repo.changectx(rev)
-        output = [hexfunc(ctx.node())]
-
-    if not ui.quiet:
-        branch = util.tolocal(ctx.branch())
-        if branch != 'default':
-            output.append("(%s)" % branch)
+        if default or id:
+            output = [hexfunc(ctx.node())]
+        if num:
+            output.append(str(ctx.rev()))
+
+    if default and not ui.quiet:
+        b = util.tolocal(ctx.branch())
+        if b != 'default':
+            output.append("(%s)" % b)
 
         # multiple tags for a single parent separated by '/'
-        tags = "/".join(ctx.tags())
-        if tags:
-            output.append(tags)
+        t = "/".join(ctx.tags())
+        if t:
+            output.append(t)
+
+    if branch:
+        output.append(util.tolocal(ctx.branch()))
+
+    if tags:
+        output.extend(ctx.tags())
 
     ui.write("%s\n" % ' '.join(output))
 
@@ -2827,8 +2844,12 @@ table = {
     "help": (help_, [], _('hg help [COMMAND]')),
     "identify|id":
         (identify,
-         [('r', 'rev', '', _('identify the specified rev'))],
-         _('hg identify [-r REV]')),
+         [('r', 'rev', '', _('identify the specified rev')),
+          ('n', 'num', None, _('show local revision number')),
+          ('i', 'id', None, _('show global revision id')),
+          ('b', 'branch', None, _('show branch')),
+          ('t', 'tags', None, _('show tags'))],
+         _('hg identify [-nibt] [-r REV]')),
     "import|patch":
         (import_,
          [('p', 'strip', 1,