facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity
9,118 Commits 24 Branches 62 Tags 320 MiB
310d950984
Commit Graph

55 Commits

Author SHA1 Message Date
Martin Geisler
e48f6a2ae3 extdiff: wrapped docstrings at 78 characters 2009-07-07 23:54:42 +02:00
Martin Geisler
be9e1c997f extdiff: fix indentation and use gettext 2009-07-07 23:30:48 +02:00
Dirkjan Ochtman
0448417ea2 extensions: change descriptions for extensions providing a few commands 2009-06-24 13:42:02 +02:00
Dirkjan Ochtman
a774ff01bc help: add/fix docstrings for a bunch of extensions 2009-06-21 16:45:47 +02:00
Cédric Duval
0caffe860f help: remove per-extension paragraph on how to enable it 
The central place to find this information is the "extensions" help topic.
 2009-06-20 20:57:13 +02:00
Martin Geisler
c624e91552 fixed typos found in translatable strings 
This is from a spell-check of hg.pot.
 2009-05-31 14:55:51 +02:00
Martin Geisler
750183bdad updated license to be explicit about GPL version 2 2009-04-26 01:08:54 +02:00
Martin Geisler
52ce98c9a8 help texts: write command line switches as -a/--abc 2009-04-18 14:40:21 +02:00
Patrick Mezard
cd3505dbbc Merge with crew-stable 2009-04-13 21:57:17 +02:00
Patrick Mezard
0d13db37f7 extdiff: preserve execute-bit across copies (issue1562) 
Bug report and test by Mads Kiilerich <mads@kiilerich.com>
 2009-04-09 14:32:44 +02:00
Patrick Mezard
de41b9ace4 extdiff: merge node and working dir snapshot modes 2009-04-13 21:21:01 +02:00
Martin Geisler
ea1734b579 expand "dir" to "directory" in help texts 2009-04-07 22:47:56 +02:00
Martin Geisler
f59683c990 extdiff: word-wrap help texts at 70 characters 2009-04-04 23:17:12 +02:00
Martin Geisler
04b0d911a3 Change double spaces to single spaces in help texts. 2009-04-04 21:09:43 +02:00
Gilles Moris
60d2f6f240 extdiff: add --change option to display single changeset diff 
This is the counterpart for extdiff of 44ccab2b73f0.
 2009-02-07 19:41:05 +01:00
Martin Geisler
cbcd677f60 lowercase ui.debug and assert output 
This does not effect the log or status commands and should be okay
according to the compatibility rules.
 2009-01-03 17:15:21 +01:00
Martin Geisler
336bd98e22 use repo.wjoin(f) instead of os.path.join(repo.root, f) 2009-01-02 22:53:33 +01:00
Martin Geisler
181b5f16b4 i18n: mark strings for translation in extdiff extension 2008-08-31 16:12:02 +02:00
Matt Mackall
d4ab55a92b status: clean up all users for unknown files 2008-06-27 13:43:29 -05:00
Matt Mackall
fbb5127472 use repo[changeid] to get a changectx 2008-06-26 14:35:46 -05:00
Matt Mackall
fb88571d19 match: remove files arg from repo.status and friends 2008-05-12 11:37:08 -05:00
Matt Mackall
e02d6f5a75 walk: remove remaining users of cmdutils.matchpats 2008-05-12 11:37:07 -05:00
Joel Rosdahl
5dae3059a0 Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
Fabio Zadrozny
37a53cf616 Propagating changes back to working dirs when changing files in external 2007-08-26 21:31:18 -03:00
Patrick Mezard
7c1d0710ee Merge with crew-stable 2007-09-10 23:53:23 +02:00
Patrick Mezard
239ea63571 extdiff: avoid repr() doubling paths backslashes under Windows 2007-09-10 23:36:01 +02:00
Brendan Cully
6c3736cbca Improve extdiff configuration. 
In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple
alias = command [opts]... form. For example:
[extdiff]
cdiff = colordiff -uprN
 2007-08-25 12:25:53 -07:00
Benoit Boissinot
ce6a51c4eb refactor options from cmdtable 
- add extracommitopts for user and date
- factor stuff
 2007-08-08 12:27:20 +02:00
Thomas Arendsen Hein
e34927453f Remove trailing spaces, fix indentation 2007-08-07 10:28:43 +02:00
Brad Schick
18eb282ff7 extdiff: do single file diffs from the wc with no copy 
Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
 2007-08-06 14:50:57 -07:00
Brad Schick
eec22b0f45 extdiff: made it less chatty in non-verbose mode 
Made the status info only display in verbose mode since most hg commands aren't so chatty. This also makes it cleaner for other extensions to call extdiff.
 2007-08-06 14:42:11 -07:00
Brad Schick
e42e7b9d8c extdiff: un-nested two functions 
The functions in extdiff that create temporary repo copies for are useful in other extensions, so the change moves them at the module level.
 2007-08-06 14:32:23 -07:00
Thomas Arendsen Hein
0b7147a667 Updated command tables in commands.py and hgext extensions. 
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
 2007-06-26 22:38:57 +02:00
Alexis S. L. Carvalho
d4de823a64 merge with crew-stable 2007-02-16 05:27:37 -02:00
Alexis S. L. Carvalho
de6a03262c extdiff: open files in binary mode 
Problem noticed by Darrell Gallion.
 2007-02-15 08:14:03 -02:00
Andrei Vermel
6c380c2c30 Make extdiff work at root directory 2007-02-15 12:51:43 +03:00
Matt Mackall
8ed93098b6 replace filehandle version of wwrite with wwritedata 2006-12-29 20:04:31 -06:00
Benoit Boissinot
0c3a966f5f extdiff: use contexts 2006-12-26 03:25:44 +01:00
Matt Mackall
296d6a7cb8 Simplify i18n imports 2006-12-14 20:25:19 -06:00
Matt Mackall
f17a4e1934 Replace demandload with new demandimport 2006-12-13 13:27:09 -06:00
Thomas Arendsen Hein
ea20cdf3f7 Removed unused ui parameter from revpair/revrange and fix its users. 2006-11-22 23:02:28 +01:00
Benoit Boissinot
cec92b2bd7 fix traceback of extdiff after a merge 
- files that comes from a different branch are marked as modified
  but aren't present in the original manifest
- add a testcase for extdiff and for regular diff
 2006-10-11 16:35:09 +02:00
TK Soh
a1ddb8da93 extdiff: use the default option only if the default program is used 2006-09-18 12:01:32 +02:00
Mathieu Clabaut
3107fb4b9f Update [extdiff] configuration sample for vimdiff, 
taking acount cmd.xxx and opts.xxx configurations item.
 2006-09-15 22:55:17 +02:00
Brendan Cully
24756bd157 Move revision parsing into cmdutil. 2006-09-14 11:19:35 -07:00
TK Soh
0658d7ce38 extdiff: do not shell-quote options to new commands 
revert a change introduced by c64ec6e8ffa2
 2006-08-28 16:30:48 -05:00
TK Soh
3f6491c428 extdiff: make new diff commands pick up their options correctly 2006-08-17 15:30:45 -05:00
Giorgos Keramidas
b558cdc911 Tune a bit the extdiff toplevel comments/samples. 
* Capitalize the first letter of all sentences

* Add an example for GNU diff(1) 'context diff' mode.

* Explain the requirement for separate cmd.xxx and opts.xxx
  options in .hgrc, which hopefully will guard against users
  trying to add:

      [extdiff]
      # Add a new Mercurial command called `cdiff', which calls
      # GNU diff(1) in 'context diff' mode.
      cmd.cdiff = diff -Nprc5

  which fails for recent crew builds with:

      $ hg cdiff .
      making snapshot of 1 files from rev 07dc4a569f4e
      making snapshot of 1 files from working dir
      diff -Nprc5: not found

  The correct way to do this is by separating the cmd.cdiff and
  opts.cdiff parts like this:

      [extdiff]
      # Add a new Mercurial command called `cdiff', which calls
      # GNU diff(1) in 'context diff' mode.
      cmd.cdiff = diff
      opts.cdiff = -Nprc5

  so add it as a new example and explicitly describe it in the
  extdiff comments.
 2006-08-15 18:14:58 +03:00
Vadim Gelfer
ad47ec66c1 extdiff: fix bugs. add test. 2006-08-14 15:51:35 -07:00
Brendan Cully
a8ca75d10f Properly shell-quote arguments in extdiff 2006-08-14 11:10:21 -07:00