Ronny Pfannschmidt avatar Ronny Pfannschmidt committed d2140e4 Merge

merge with main branch

Comments (0)

Files changed (2)

+\.pyc$
         win32clipboard.CloseClipboard()
 
 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/hgpaste.py
+    The paste is done on http://paste.pocoo.org/ 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 = http://paste.pocoo.org/
-
+    By default, the pasted text is also copied to the system clipboard;
+    the -n option prevents that.
     """
     import xmlrpclib
     server = ui.config('paste', 'server', 'http://paste.pocoo.org/')
     else:
         url = '%sshow/%s/' % (server, rv)
         ui.status(url + '\n')
-        if not opts['nopaste']:
+        if not opts['nocopy']:
             copy_to_clipboard(url)
 
 cmdtable = {
     '^paste': (
         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')],
         commands.table['^diff'][2],
     )
 }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.