Commit Graph

2887 Commits

Author SHA1 Message Date
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
Thomas Arendsen Hein
d4d1d2313a Fixed test-extdiff.
diff-like tools usually return 1 if differences are found.
Currently the extdiff returns 256, but that's a different topic
(consolidating return code handling in hg).
2006-08-15 16:04:47 +02:00
Brendan Cully
148da73c46 A fix for --prune. 2006-08-15 00:03:48 -07:00
Thomas Arendsen Hein
f7a86f8d81 Adjusted test to changed help output. 2006-08-15 11:47:17 +02:00
Thomas Arendsen Hein
6c61118d58 merge with jeffpc 2006-08-15 11:22:29 +02:00
Josef "Jeff" Sipek
c724746ef3 Use demandload in hgk 2006-08-15 05:12:27 -04:00
Brendan Cully
c18265f47c Add diff --git option 2006-08-14 22:48:03 -07:00
Vadim Gelfer
ad47ec66c1 extdiff: fix bugs. add test. 2006-08-14 15:51:35 -07:00
Brendan Cully
bc3e797936 Allow qdel to delete multiple patches. 2006-08-14 11:41:08 -07:00
Brendan Cully
4b6f1503bf Replace qdel/qfold -f option with -k/--keep. 2006-08-14 11:24:19 -07:00
Brendan Cully
a8ca75d10f Properly shell-quote arguments in extdiff 2006-08-14 11:10:21 -07:00
Brendan Cully
82df5e8de9 Update extdiff for recent refactoring 2006-08-14 11:07:15 -07:00
Brendan Cully
44847fbcba Test for log --prune. 2006-08-14 10:27:02 -07:00
Giorgos Keramidas
34f2e044af hgweb: partially revert ce444c810fcf
The change from self.repo.ui.diffopts() to ui.diffopts() causes a
traceback when the diff of a changeset should be displayed in the
web interface.  Revert to self.repo.ui.diffopts() for now.
2006-08-14 16:06:37 +03:00
Vadim Gelfer
453f16d1d7 cmdutil.matchpats: allow include/exclude to be optional. 2006-08-13 17:03:33 -07:00
Vadim Gelfer
15c30eaff6 add default values to arguments of walk etc. 2006-08-13 17:03:03 -07:00
Vadim Gelfer
92dd5b8dc0 move commands.addremove_lock to cmdutil.addremove 2006-08-13 16:57:45 -07:00
Vadim Gelfer
f3ad0810cd move walk and matchpats from commands to cmdutil. 2006-08-13 16:11:22 -07:00
Vadim Gelfer
ed05627ce0 fix patch.patch.filterfiles.
now test-diff-subdir passes.
2006-08-13 15:24:30 -07:00
Vadim Gelfer
cc643dbb24 make test-diff-subdir executable. 2006-08-13 15:03:48 -07:00
Giorgos Keramidas
cbaa061404 tests: new test for hg diff of a subdirectory only 2006-08-13 23:00:18 +03:00
Giorgos Keramidas
766ec3ae08 Make clear that hg pull -r REV pulls "up to" a revision.
The existing message was a bit confusing, making the reader
believe that only the specific revision is pulled.
2006-08-13 18:35:24 +03:00
Giorgos Keramidas
95ed16f229 Use cached hg-root-dir instead of rediscovering
by a second call to (hg-root).  We have the path
we need already as the value of hg-root-dir.
2006-08-13 20:21:13 +03:00
Giorgos Keramidas
95e3cba367 hgweb: repo.changes() is now called repo.status() 2006-08-13 18:01:44 +03:00
Vadim Gelfer
80d6f2f7c7 remove localrepository.changes.
use localrepository.status instead.
2006-08-12 16:40:12 -07:00
Vadim Gelfer
13d751feaf refactor text diff/patch code.
rename commands.dodiff to patch.diff.
rename commands.doexport to patch.export.
move some functions from commands to new mercurial.cmdutil module.
turn list of diff options into mdiff.diffopts class.

patch.diff and patch.export now has clean api for call from 3rd party
python code.
2006-08-12 16:13:27 -07:00
Vadim Gelfer
12c9f17ffe merge. 2006-08-12 16:05:09 -07:00
Vadim Gelfer
7670c341e7 manifest.execf is now a function. 2006-08-12 16:04:49 -07:00
Vadim Gelfer
00af865078 merge. 2006-08-12 15:43:38 -07:00
Vadim Gelfer
57aab63e91 util: qualify name properly. 2006-08-12 15:41:26 -07:00
Brendan Cully
3d708cb539 grep: add --follow support. 2006-08-12 15:01:46 -07:00
Vadim Gelfer
94b6c7e074 mq: demandload more 2006-08-12 14:15:23 -07:00
Brendan Cully
3b28d277f1 grep: display correct user/revision for --all in reverse.
Also handle multiple occurrences of the same line by storing
linestates in an array instead of a dict, and using difflib
to compute the difference between linestates.
2006-08-12 13:51:14 -07:00
Vadim Gelfer
beb26e5257 commands.import: refactor patch parsing into patch.extract. 2006-08-12 13:16:48 -07:00
Vadim Gelfer
2eab8e108e merge git patch code. 2006-08-12 12:47:18 -07:00
Vadim Gelfer
dc377b58c1 update copyrights. 2006-08-12 12:30:02 -07:00
Vadim Gelfer
d9b62ad587 merge. 2006-08-12 12:12:23 -07:00
Alexis S. L. Carvalho
219803f060 Fix some bugs introduced during the manifest refactoring 2006-08-12 08:53:23 -03:00
Alexis S. L. Carvalho
27e6e90b97 Fix "hg qnew -f foo" without -m
The refresh method assumes it has a string.
2006-08-12 09:24:04 -03:00
Vadim Gelfer
ea424c45c0 merge with mpm. 2006-08-12 11:53:12 -07:00
Brendan Cully
8ebc2ba929 Tests for git import 2006-08-11 16:56:31 -07:00
Brendan Cully
81f4208ee0 Remove debugging line 2006-08-11 16:55:48 -07:00
Brendan Cully
140c2e7776 Fix bad merge with crew 2006-08-11 16:30:24 -07:00
Brendan Cully
4f1b3a83bb Move patch-related code into its own module. 2006-08-11 15:50:16 -07:00
Brendan Cully
7601c19932 Teach import to understand git diff extensions.
Vanilla patch chokes on git patches that include files that are copied
or renamed, then modified. So this code detects that case and rewrites
the patch if necessary.
2006-08-11 15:50:07 -07:00
Vadim Gelfer
f878066622 import: get lock and wlock one time
this makes import of many patches 6x faster in kernel repo.
2006-08-11 14:50:41 -07:00
Matt Mackall
5c0d170547 Remove manifest.readflags 2006-08-11 11:00:38 -05:00
Matt Mackall
44b96c96eb Change remaining users of manifest flags 2006-08-11 10:57:42 -05:00
Thomas Arendsen Hein
8d8bec1f32 Adjusted documentation for hgrc's "[smtp] host" for change in e579f762cc2a. 2006-08-11 09:11:54 +02:00
Matt Mackall
756da188ad Switch to simpler manifestdict 2006-08-10 22:38:56 -05:00