Ronny Pfannschmidt committed d2140e4 Merge

merge with main branch

Comments (0)

Files changed (2)

 def paste(ui, repo, *pats, **opts):
-    """
-    quickly paste a diff to a Lodgeit instance
+    """Paste current working directory changes or a specified changeset.
-    activate the extension and set the name of your server in hgrc::
+    Treat the all arguments as for the
+    "hg diff" command and paste the resulting diff.
-        [extensions]
-        hgpaste = path/to/
+    The paste is done on by default, but a
+    different server with a compatible XMLRPC interface can be selected
+    in the configuration (add a "server" value in a "paste" section).
-        [paste]
-        server =
+    By default, the pasted text is also copied to the system clipboard;
+    the -n option prevents that.
     import xmlrpclib
     server = ui.config('paste', 'server', '')
         url = '%sshow/%s/' % (server, rv)
         ui.status(url + '\n')
-        if not opts['nopaste']:
+        if not opts['nocopy']:
 cmdtable = {
     '^paste': (
-        commands.table['^diff'][1] + [('n', 'nopaste', None, 'do not copy to clipboard')],
+        commands.table['^diff'][1] + [('n', 'nocopy', None, 'do not copy to clipboard')],