facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity
19,851 Commits 24 Branches 62 Tags 322 MiB
90dc6e20e1
Commit Graph

4141 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
2a7cf18720 use ui.readsections in the notify extension 2006-10-17 17:04:25 -03:00
Aurelien Jacobs
de3b8c9c6a document the diffstat option of the notify extension 2006-10-15 16:35:47 +02:00
Brendan Cully
5bda764afc mq: make qdelete without -k or a subrepository delete all patches 2006-10-12 14:02:41 -07:00
Brendan Cully
dbfd263f15 mq: change qdel --forget to --rev; accept any revision symbol 2006-10-12 13:24:09 -07: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
Josef "Jeff" Sipek
8ecf30a8c5 [patchbomb] prepend leading zeros in the "[PATCH N of M]" string 
Without this patch, if one tries to send a patch bomb with more than 9
patches, the resulting subjects are not easily alphabetically sortable.

For example:

...
[PATCH 9 of 10]
[PATCH 10 of 10]

This patch prepends as many leading zeros as necessary. E.g.,

[PATCH 09 of 10]

or

[PATCH 009 of 100]
 2006-10-07 15:16:47 -04:00
Brendan Cully
22ee164176 patchbomb: update --attach to use cmdutil.make_filename 2006-10-04 12:39:51 -07:00
Brendan Cully
1bdb991336 mq: update qfold to call delete correctly 2006-10-03 16:36:40 -07:00
Thomas Arendsen Hein
0a7b982aa6 Whitespace/Tab cleanup 2006-10-01 19:26:33 +02:00
Brendan Cully
9e8bccc466 mq: raise util.Abort instead of using sys.exit(1) 2006-09-28 11:41:33 -07:00
Brendan Cully
e754f202f1 mq: don't write applied patches into series twice in restore 2006-09-27 14:50:20 -07:00
Brendan Cully
bb7a414550 mq: bail out if a patch appears more than once in the series file. 
Closes: #379.
 2006-09-27 14:32:53 -07:00
Brendan Cully
589f502f37 mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev 
This moves most of the queue display code into qseries.
 2006-09-27 13:34:20 -07:00
TK Soh
f95e986302 hgk: fix mixup of --limit and REVRANGE in hgk call 2006-09-27 08:27:16 -05:00
Brendan Cully
7c9528ede7 mq: Add --rev argument to qimport, to adopt existing changesets. 2006-09-19 10:22:30 -07:00
Brendan Cully
2e045795a2 qimport: rename patch to patchname to avoid shadowing module 2006-09-19 08:45:39 -07: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
Matt Doar
223e5f58eb Add support for diffstat in commit emails, and move diffstat from 
patchbomb to patch
 2006-09-13 13:14:08 -07:00
Benoit Boissinot
3b788ed358 merge with brendan 2006-09-15 00:51:27 +02:00
Brendan Cully
d8b28f01d1 mq: handle patch names containing ":" 2006-09-14 22:52:47 +02:00
Brendan Cully
24756bd157 Move revision parsing into cmdutil. 2006-09-14 11:19:35 -07:00
Brendan Cully
7bcd472f27 hgk: add --limit, and revranges 2006-09-13 18:24:58 -07:00
Brendan Cully
8be3ac699a hgk: add revision numbers 2006-09-13 13:50:28 -07:00
Brendan Cully
6222780283 mq: add qdelete --forget option 
This removes an applied patch from the series and status files without
popping it. It is useful when an mq patch has been applied upstream.
 2006-09-14 15:35:55 +02:00
Brendan Cully
4ee037e2c4 mq: do not update an empty working directory after strip. 
Closes #296.
 2006-09-13 16:41:03 -07:00
Brendan Cully
50d115c936 mq: Add --git option to qrefresh 2006-09-12 11:11:19 -07:00
john.levon@sun.com
7605f2282e Add the -s option to hg help qseries. 2006-09-13 21:46:36 +02:00
Brendan Cully
5ee5b4abae Make qrename handle directory targets; closes #333. 2006-09-13 08:57:08 -07:00
Thomas Arendsen Hein
86029c616c Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index. 2006-09-12 17:27:41 +02:00
Benoit Boissinot
2067941fd0 merge with brendan 2006-09-09 12:51:05 +02:00
Brendan Cully
6cac22e075 strip: strip changelog before manifest 2006-08-30 15:13:45 -07:00
Benoit Boissinot
2d86b2d7e4 hgk.py: fix warnings from pychecker 
- unused variables
- usage of undefined variables (opts and filterfiles)
 2006-09-06 02:15:33 +02:00
Benoit Boissinot
8621fb4642 hgk.py: add an optional file list to debug-diff-tree 
this solves a problem when hgk was trying to display merges diff
 2006-09-06 02:13:08 +02: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
Thomas Arendsen Hein
d2082f10fc Never apply string formatting to generated errors with util.Abort. 
Otherwise error messages containing % chars yield errors or worse.
Fixed (hopefully) all users of util.Abort.
 2006-09-08 09:36:18 +02:00
Benoit Boissinot
3d175cdcb6 hgk.py: fix for a bug introduced in 9ac9fb0b5ce2 2006-09-08 00:56:37 +02:00
Benoit Boissinot
1023f810da hgk.py: use mercurial.patch functions when possible 2006-09-07 14:13:01 +02:00
Benoit Boissinot
9a1b066989 hgk.py: use nullid instead of a constant 2006-09-07 14:01:00 +02:00
Mikhail Sobolev
e7d241fbe1 really treat the right side of acl.{allow,deny} as a list of users 
the current implementation seems to expect only user per pattern, which
contradicts the documentation available at the file beginning.
 2006-06-27 01:41:07 +03:00
TK Soh
653bca13b7 hgk: use short changeset hashes 
this fixes the missing tags on hgk window
 2006-08-24 16:12:23 -05:00
Brendan Cully
ea35700afd Detect git patches in patchbomb makepatch function 2006-08-30 12:55:10 -07:00
Brendan Cully
bdc3f820b0 Merge with crew 2006-08-30 10:21:02 -07:00
Brendan Cully
af80a5f6e8 Add --git support to hg email 2006-08-30 10:17:35 -07:00
Brendan Cully
b733859249 Call patch.diff directly instead of printdiff - this also saves an 
extra walk of the working directory.
 2006-08-29 17:08:55 -07:00
Alexis S. L. Carvalho
7831cbb9a7 Fixed an exception in notify extension (b2a_hex argument incorrect) 
Detailed messages was - incoming.notify hook raised an exception: b2a_hex() argument 1 must be string or read-only character buffer, not stringio
 2006-08-24 15:19:56 -07:00
Edouard Gomez
8d7e46a614 Fix hgk extension due to ce444c810fcf refactoring 2006-08-23 00:19:24 +02:00
Bryan O'Sullivan
c48ecf0092 qheader: exit withh meaningful error code. 2006-08-22 16:59:09 -07:00
Bryan O'Sullivan
5a2ca1b7f7 MQ: Make more commands return meaningful errors. 2006-08-22 16:03:55 -07:00
Bryan O'Sullivan
c679ba9347 qrefresh: exit with status 1 if no patches applied. 2006-08-22 15:14:35 -07:00
Vadim Gelfer
f7e52c304c mq: fix bad interaction between demandload and update of commands.norepo 
problem was that commands.norepo was not updated properly.
 2006-08-21 13:59:17 -07:00
TK Soh
3f6491c428 extdiff: make new diff commands pick up their options correctly 2006-08-17 15:30:45 -05:00
Vadim Gelfer
a7a2bb9df7 merge with brendan. 2006-08-18 13:01:40 -07:00
Brendan Cully
2af338f22f mq: fix appliedname 2006-08-16 19:55:42 -07:00
Brendan Cully
b85f7240b1 mq help text updates and speling fixes 2006-08-16 19:53:42 -07:00
Brendan Cully
3c579c8031 Add qnew -e option. 2006-08-16 19:53:01 -07:00
Brendan Cully
6fb5a7ec26 allow qrefresh to take a list of files; closes #96. 2006-08-16 19:52:21 -07:00
Brendan Cully
af32b3788b Fix test-mq-qdiff; add -I and -X options to qdiff 2006-08-16 19:51:39 -07:00
Brendan Cully
e5d7aafaf2 Fix qfold after recent changes 2006-08-16 19:50:50 -07:00
Brendan Cully
16fb95a415 Teach mq about git patches 2006-08-16 19:49:45 -07:00
Brendan Cully
d2c9866d08 patchbomb: import new mail module 2006-08-16 11:03:45 -07:00
Giorgos Keramidas
e8a0d4b9fc hgext: more patchbomb documentation 
+ Add a description of how to enable this extension

+ Note which command it provides (it's not very easy to guess
  that "hgext.patchbomb" enables the "email" command, unless one
  can read Python sources)

+ Expand the descriptions of the -n and -m options of "hg email".

+ Mention that formail is (commonly) part of the procmail package.
 2006-08-15 23:37:37 +03:00
Vadim Gelfer
9614f4bd5b redo merge with mpm. 
previous merge at 8c0343e3f2b7 was bad.
 2006-08-16 10:52:19 -07:00
Matt Mackall
f849bdf704 Move ui.sendmail to mail.connect/sendmail 2006-08-15 14:06:50 -05:00
Brendan Cully
2709262462 Unify mq and hg patch invocation. 
This makes patch a little less verbose by default, so the tests
had to be updated.
 2006-08-15 11:28:50 -07:00
Matt Mackall
6ecbc46d1a Move ui.diffopts to patch.diffopts where it belongs 2006-08-15 11:34:08 -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
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
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
Vadim Gelfer
92dd5b8dc0 move commands.addremove_lock to cmdutil.addremove 2006-08-13 16:57:45 -07: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
94b6c7e074 mq: demandload more 2006-08-12 14:15:23 -07:00
Vadim Gelfer
dc377b58c1 update copyrights. 2006-08-12 12:30:02 -07: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
Matt Mackall
44b96c96eb Change remaining users of manifest flags 2006-08-11 10:57:42 -05:00
Vadim Gelfer
a1eb2e0ec1 mq: only add mq attribute to local repo 2006-08-10 17:33:08 -07:00
Vadim Gelfer
cefae5007c mq: apply patch is any posative guard matches 
this is like guards command from quilt package.
 2006-08-10 17:18:55 -07:00
Vadim Gelfer
bfa688e22b fetch: fix test fail 2006-08-10 17:02:11 -07:00
Vadim Gelfer
375ed90afa mq: do not allow to push from repo with patches applied 2006-08-10 16:10:59 -07:00
Brendan Cully
00705b2507 Disallow commit over an applied mq patch. 2006-08-10 11:18:48 -07:00
Vadim Gelfer
65c989bccf qselect: add --pop, --reapply options 2006-08-10 14:58:10 -07:00
Matt Mackall
76c5adea2f Merge with crew, fix most tests 2006-08-09 13:55:18 -05:00
Vadim Gelfer
626fbfdeed mq: make guards more strict, add tests 2006-08-09 09:38:11 -07:00
Vadim Gelfer
594d062505 mq: drop qversion command 2006-08-08 17:11:36 -07:00
Vadim Gelfer
b365694c04 fetch: hold lock and wlock across all operations 2006-08-08 17:08:59 -07:00
Vadim Gelfer
fa92533acd fetch: lock repo across pull and commit 2006-08-08 16:40:08 -07:00
Vadim Gelfer
03412632fc fetch: drop commands.doupdate 2006-08-08 16:37:41 -07:00
Vadim Gelfer
9b3aa8dfc1 fetch: fix breakage from mpm. 
add test so will not break again.
 2006-08-08 16:09:26 -07:00
Vadim Gelfer
3ea890331f mq: new commands qselect, qguard 
implement quilt-style guards for mq.

guards allow to control whether patch can be pushed.

if guard X is active and patch is guarded by +X (called "posative guard"),
patch can be pushed.  if patch is guarded by -X (called "nagative guard"),
patch cannot be pushed and is skipped.

use qguard to set/list guards on patches.  use qselect to set/list
active guards.

also "qseries -v" prints guarded patches with "G" now.
 2006-08-08 21:42:50 -07:00
Vadim Gelfer
07b40a89d5 mq: add join method 2006-08-08 18:12:48 -07:00
Matt Mackall
de047b03ce Introduce update helper functions: update, merge, clean, and revert 2006-08-07 22:54:33 -05:00
Matt Mackall
5d20f724f3 Fix extensions for merge change 2006-08-07 17:26:09 -05:00
Brendan Cully
4d9ff1b476 Make mq camelcase consistent with the rest of hg. 2006-08-07 14:59:32 -07:00
Brendan Cully
17df733f51 Update qsave to use StatusEntry; don't throw exception on bad status lines. 2006-08-07 14:48:18 -07:00
Brendan Cully
8601c3c0fc Update mq to use new logmessage arglist from 2794:7eff50864c5c 2006-08-07 14:12:03 -07:00
Matt Mackall
3dcc28a29a Merge with crew 2006-08-07 16:47:06 -05:00
Vadim Gelfer
f653b6c12f fetch: add missing import. 2006-08-07 19:08:55 -07:00
Vadim Gelfer
4068ec9129 fetch: do not fetch if working dir modified 2006-08-07 17:33:14 -07:00
Vadim Gelfer
d90021dfb5 new extension: fetch -> combine pull and merge/update 
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.

this makes useful command like git 'pull' command.
 2006-08-07 17:27:38 -07:00
Benoit Boissinot
1c4f02dea9 mq: unused variables, improper usage of 'is [not]', undefined variable 2006-08-06 17:27:05 +02:00
Benoit Boissinot
6f5cfdaee1 mq: codingstyle 2006-08-06 17:24:13 +02:00
Benoit Boissinot
c62e480a61 mq: remove unecessary test 2006-08-06 17:20:51 +02:00
Benoit Boissinot
541cff5e76 mq: fix variables shadowing builtin 2006-08-06 17:18:53 +02:00
Brendan Cully
879b9bce42 mq: use more portable util.parse_patch_output instead of handrolled version. 2006-08-05 14:59:47 -07:00
Brendan Cully
5d7f00c97d Add portable shell-quoting function; teach mq to use it. 2006-08-05 15:23:26 -07:00
Benoit Boissinot
69b70a588e mailbomb: add a comment and remove the bcc in a more pythonic way 2006-08-06 16:03:02 +02:00
Vadim Gelfer
c5053e3bb6 make error better. 2006-08-05 02:00:09 -07:00
Matt Mackall
65b6faa1aa Move merge code to its own module 
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
 2006-08-03 15:24:41 -05:00
Vadim Gelfer
e7a19cd577 merge with brendan. 2006-08-03 11:12:02 -07:00
Brendan Cully
03cc700164 Use StatusEntry class instead of repeated status line parsing. 
This small cleanup abstracts out repeated instances of
(rev, name) = applied[x].split(':'), making it easier to use
applied or change the status file format.
 2006-08-03 11:09:12 -07:00
Vadim Gelfer
25f77c8e58 mq: make queue.unapplied useful as api 2006-08-02 21:06:12 -07:00
Vadim Gelfer
9f3dbcd014 mq: print matches if patch name not unique 2006-08-02 06:36:27 -07:00
Vadim Gelfer
7369cfc5b9 mq: simplify save_dirty 2006-08-02 20:33:57 -07:00
Brendan Cully
cd3bd9b901 Add -f option to qfold; improve qfold documentation. 2006-08-02 15:07:37 -07:00
Brendan Cully
a7db3381e3 Clean up qnew help text. 2006-08-02 14:48:59 -07:00
Vadim Gelfer
821fc85964 mq: rename read_series as parse_series, make simpler and faster 2006-08-02 10:48:34 -07:00
Bryan O'Sullivan
688915efdf fix call to commands.setremoteconfig 2006-08-02 09:18:56 -07:00
Vadim Gelfer
dc26ae9fe1 merge patches from brendan cully that did not apply clean against tip. 2006-08-01 15:40:28 -07:00
Brendan Cully
fecf9b2ed3 Add -s option to qseries: display first line of patch header. 2006-08-01 15:24:18 -07:00
Brendan Cully
b29cf92839 Add more verbose help text to mq commands. 2006-08-01 15:24:12 -07:00
Brendan Cully
00c221cfbb Add -m, -l, -e options to qfold. 2006-08-01 15:24:11 -07:00
Brendan Cully
68e0fb5d2a Add -f option to qdelete, to remove patch file. 2006-08-01 12:21:55 -07:00
Vadim Gelfer
a1413b0539 mq: add qmv as alias for qrename 2006-08-01 10:57:28 -07:00
Brendan Cully
7750dbbb50 New self-explanatory command qrename. 2006-08-01 10:55:06 -07:00
Brendan Cully
7e5a1a4d6a New mq command qfold: Merge patches into the current patch. 
Patches should be in the series file but not yet applied.
 2006-07-31 20:33:56 -07:00
Brendan Cully
af61c60015 Add command qheader to display the header of a given patch. 2006-07-31 18:39:31 -07:00
Brendan Cully
8d18dc1a62 Add option -e/--edit to qrefresh, to edit the existing header. 2006-07-31 17:55:43 -07:00
Brendan Cully
c05a6aafc0 Change patch header as well as commit message with qrefresh -m or -l. 2006-07-31 18:47:43 -07:00
Brendan Cully
0dab08cb0c Remove pointless reposetup hook from hgk.py 2006-08-01 02:23:05 -07:00
Alexis S. L. Carvalho
eb9aa4b11b mq: correct the use of super 
The first argument passed to super is supposed to be the class where
it's being used, not self.__class__ - the two can be different when
there's inheritance involved.
 2006-07-31 14:22:17 -03:00
Vadim Gelfer
c39398b49b merge with mpm. 2006-07-30 22:52:34 -07:00
Matt Mackall
fb73e75b58 Kill ui.setconfig_remoteopts 
This brought too much knowledge about command line particulars into
the ui code. Moved to commands.py.
 2006-07-31 00:47:43 -05:00
Vadim Gelfer
8113ef1e80 mq: allow to apply patches in subdir of repo again 
i broke it in d752547f000a.
 2006-07-29 11:05:39 -07:00
Alexis S. L. Carvalho
0430d76b15 hbisect.py: don't rely on __del__ to write the current state. 
This is yet another page of the "Thou shalt not do too much inside
__del__ methods" book, in the "demandload and __del__ don't go well
together" chapter.

The bisect extension is broken in 0.9.1:

$ hg bisect init
$ hg bisect bad
Fatal Python error: Interpreter not initialized (version mismatch?)
Aborted

(yes, I tripled checked my instalation to make sure the problem is not
there)

It's been broken since revision 35b6c1ed51fd moved the import of the
binascii module into a demandload.

(In details: the first time that "hg bisect bad" (or good) is called,
there are still no revisions saved in .hg/bisect/*, so bisect.__init__
doesn't call hg.bin on anything.  So, when we reach __del__, the
binascii module still hasn't been imported and we get that "nice"
message above.)
 2006-07-28 21:20:41 -03:00
Christian Ebert
4f7c14a605 patchbomb: do not write Bcc 2006-07-29 10:27:54 +02:00
Vadim Gelfer
090f26bfb5 mq: update to handle repomap not longer used 2006-07-28 14:31:20 -07:00
Brendan Cully
fa56cc4df5 mq: replace module-wide repo hash with a repo attribute 2006-07-28 13:08:25 -07:00
Brendan Cully
09698d36ee mq: do not hold a reference to repo in tags override 
Instead, replace repo's class object with a subclass.
 2006-07-28 13:08:21 -07:00
Christian Ebert
341a9cc179 patchbomb: fix generation of message-id when sending attachments 
node was set to bin(node) before message-id was created
 2006-07-28 22:17:32 +02:00
Vadim Gelfer
9f04cf77e6 mq: add qclone command 2006-07-28 10:46:41 -07:00
Vadim Gelfer
7505745e16 mq: fix queue.apply to not call os.chdir() 
call to os.chdir broke "hg -R dirname qpush".
instead pass -d (change directory) option to patch command.
 2006-07-27 18:24:59 -07:00
Vadim Gelfer
c75d013f82 mq: move many error messages to util.Abort 2006-07-27 16:41:59 -07:00
Vadim Gelfer
95c056a904 mq: do not allow to qnew a patch twice 2006-07-27 16:08:56 -07:00
Vadim Gelfer
2fec671b08 patchbomb: add content-disposition to make display inline and add filename 
if rev being emailed has tag that ends in .patch or .diff then use that as
filename. else make up filename from name of repo.
 2006-07-27 15:19:58 -07:00
Christian Ebert
64ba2370e6 patchbomb: optionally send patches as inline attachments 2006-07-27 22:28:03 +02:00
Vadim Gelfer
be51fbc3c0 merge with crew. 2006-07-27 12:36:17 -07:00
Christian Ebert
40b4014496 make introductory message of patch series text/plain 2006-07-27 21:25:39 +02:00
Chris Mason
5a55931f23 mq: strip should not blow away local changes 
This changes the mq strip command to abort if there are any changes in
the working directory.
 2006-07-27 09:27:45 -07:00
Chris Mason
efeb029828 mq: fix qnew and qimport to deal with series file comments 
qnew and qimport did not take comments into account when deciding where
to place new patches in the series file.
 2006-07-27 09:27:42 -07:00
Chris Mason
d6e27326d7 mq: qpop should act like quilt pop 
qpop patchname would pop the named patch off the stack.  This is slightly
different from how quilt pop works.  quilt pop pops everything up to the
named patch.
 2006-07-27 09:27:39 -07:00
Chris Mason
0567a3c508 mq: patch naming shortcuts 
This adds some more options to the mq lookup routine.  It allows
you to use shortcuts in naming patches to push or pop.  You
can now use:

1) a full patch name
2) a number to indicate an offset in the series file
3) a unique substring of the patch name
4) patchname[-+]num to indicate an offset from a given patch.

For case #3 substrings are allowed.  qtip and qbase are aliases for
the top and bottom of the applied patch queue, unless they are already
in the series file as patch names.
 2006-07-27 09:27:35 -07:00
Mathieu Clabaut ext:(%22)
f056efd753 MQ: uniformise message and logfile option. 
Possibility to change message in qrefresh option
 2006-07-26 20:11:54 +02:00
Brendan Cully
e5bea098db Add mq patch names to tagscache instead of overriding lookup. 
This makes mq patch names visible in hg log and hg tags. It also
resolves the names only once, rather than on every lookup.
 2006-07-26 12:22:04 -07:00
Christian Ebert
6dda35f7a7 optionally send blind carbon copies 
Bcc recipients may be set via long `--bcc' or hgrc only, no prompt.
 2006-07-26 14:39:33 +02:00
Mathieu Clabaut ext:(%22)
0bf956044f mq: uniform verbose display of patche[s]. 
In verbose mode, display:
   "index patchname" for unapplied patches
   "index cset:patchnames" for applied patches
   "index status patchname" in the serie listing.
 2006-07-26 01:03:33 +02:00
Mathieu Clabaut ext:(%22)
5754e8f808 extdiff : add comment on how to use vim for doing directoy diff 2006-07-25 23:10:11 +02:00
Brendan Cully
7a70e197ba Add qtip and qbase to mq qlookup. 2006-07-20 11:52:28 -07:00
Brendan Cully
e73d6c3e4d Mq: modify repo.lookup to resolve applied patches too. 2006-07-20 11:52:28 -07:00
Vadim Gelfer
eef60e2c8d help: add help to mq extension 2006-07-03 14:30:38 -07:00
Thomas Arendsen Hein
703b773cf0 Merge with crew. 2006-06-30 22:09:43 +02:00
Thomas Arendsen Hein
d17f2a589b Merge with crew. 2006-06-30 21:35:28 +02:00
Brendan Cully
e07fd10605 hgk: Don't choke on empty changelogs 2006-06-30 21:35:22 +02:00
Chris Mason
f6facbf17c mq: fix qparents to return the correct parent when no patches are applied 2006-06-27 10:49:46 -04:00
Chris Mason
26fe10a876 mq: hg qnew -f should refresh the new patch 
qnew -f was originally meant to just skip the localchanges check.
But, it currently discards the local changes, which is not at all what
people expect.

This patch changes qnew -f to create the new patch and then
run hg qrefresh on it.  The local changes will be in the new
patch.
 2006-06-27 11:23:06 -04:00
Thomas Arendsen Hein
d7742cf972 mq: Added help for qcommit, consistently talk about queue repository. 2006-06-28 08:56:01 +02:00
Vadim Gelfer
d49fb207db mq: add qimported patches if patch dir is a repo 2006-06-23 12:52:42 -07:00
Volker Kleinfeld
76de44d843 patchbomb does not handle email time stamp plattform independent 2006-06-16 07:07:11 -07:00
Vadim Gelfer
844d833844 move hgk.py into hgext. now to enable "hg view" is one less step. 
edit ~/.hgrc:

[extensions]
hgext.hgk =

cp contrib/hgk ~/bin
 2006-06-14 15:41:06 -07:00
Vadim Gelfer
bd8276a666 move purge extension out of hgext. 
it is not as clean as other modules in hgext.
can move back after rewrite.
 2006-06-04 17:08:02 -07:00
Thomas Arendsen Hein
48565af0dc Make indentation of purge's cmdtable match to mercurial/commands.py 2006-06-02 00:33:42 +02:00
Thomas Arendsen Hein
dbe2eb1f66 Rewritten install instructions for hg-purge to match new situation, fixed typos. 2006-06-02 00:28:28 +02:00
Thomas Arendsen Hein
bb2919687f Merged hg-purge 2006-06-01 23:58:43 +02:00
Thomas Arendsen Hein
927486279d Reorganized files in hg-purge repo to push them into Mercurial. 
README -> hgext/purge/README
purge.py -> hgext/purge/__init__.py
removed COPYING.GPL and .hgignore (already in the Mercurial repo)
 2006-06-01 23:58:06 +02:00
Benoit Boissinot
4d70fafe0d better ui for the bisect extension 
(and update to i18n)
 2006-05-26 22:17:43 +02:00
Vadim Gelfer
e684399d7c add acl extension, to limit who can push to subdirs of central repo. 2006-05-23 14:58:30 -07:00
Daniel Santa Cruz ext:(%22)
3232a6998e Minor typo change to reflect actual values used. 2006-05-22 12:17:44 -04:00
Vadim Gelfer
34b7a0d83b merge with crew. 2006-05-21 23:39:25 -07:00
Vadim Gelfer
38e7119eca new extension: extdiff. allows to use external diff program. 2006-05-21 23:39:07 -07:00
Vadim Gelfer
10c73bbd93 notify: add debug output. do not fail if no config file. 
use --debug to see debug output.
 2006-05-20 12:52:02 -07:00
Vadim Gelfer
be9056ad56 notify: fix off by one error. 2006-05-19 14:57:45 -07:00
Vadim Gelfer
25b53cf653 bugzilla: allow to map between committer email and bugzilla user name. 2006-05-18 09:23:43 -07:00
Thomas Arendsen Hein
914957ee60 Removed extra space in bisect output. 2006-05-18 08:03:51 +02:00
Thomas Arendsen Hein
be0ce7238f Strip empty lines and trailing spaces around commit messages. 
Fixes issue213 and part of issue249 (trying to keep node id on import)
 2006-05-17 19:38:41 +02:00
Thomas Arendsen Hein
be2a7bb68c Use "# Date" instead of "# Timestamp" for dated export/import of patches. 
And don't break up list for % formatting.
 2006-05-17 19:00:16 +02:00
Danek Duvall
2a19fd683a Add timestamp field to export format. Make import and mq use it. 2006-05-17 18:54:30 +02:00
Aurelien Jacobs ext:(%22)
b68ea13e18 notify changeset diff should be against current node instead of tip 2006-05-16 14:17:45 -07:00
Vadim Gelfer
de0a3b422b allow to send email using sendmail. 
default is still smtp.
update hgrc doc with sendmail info.
 2006-05-15 10:25:17 -07:00
Danek Duvall
9b6197b107 Fix issue240: mq: qpush fails on Solaris 2006-05-11 18:24:58 -07:00
Vadim Gelfer
42391c45d8 bugzilla hook: skip empty groups. 2006-05-09 14:39:56 -07:00
Thomas Arendsen Hein
ce9a04e13f gpg extension: Always remove temporary files created by 'hg sigcheck'. 2006-05-09 13:26:16 +02:00
Vadim Gelfer
990eecd90f localrepository.addchangegroup: add more source infos to hooks 2006-05-08 16:50:27 -07:00
Vadim Gelfer
8ea7dbe8d0 notify: add 'to' header to message. 2006-05-08 12:27:30 -07:00
Vadim Gelfer
a82c03a7e0 notify extension: generate right number of diffs 2006-05-08 11:16:09 -07:00
Vadim Gelfer
41eb4e2c6e reverse sense of return value from python hooks. 
old scheme (False/None/0/'' == fail) made coding style
unnatural, did not allow use of mercurial commands as hooks.

new scheme (False/None/0 == pass) is pythonic, does not require peculiar
"return True" at ends of hooks, allows hooks like this:

[hooks]
# update working dir after push into this repo
changegroup.update = python:mercurial.commands.update
 2006-05-08 10:59:58 -07:00
Vadim Gelfer
dd7442a4f4 merge with crew. 2006-05-08 08:04:46 -07:00
Vadim Gelfer
ef1e3759c2 add email notification hook. hook written in python. 
email headers and body can be customized using template code.
 2006-05-04 15:07:35 -07:00
Bryan O'Sullivan
f8888fa454 patch queue: notify.patch 2006-05-04 12:25:10 -07:00
Vadim Gelfer
f906ed16e7 move mail sending code into core, so extensions can share it. 
document hgrc settings used.
 2006-05-04 12:23:01 -07:00
Vadim Gelfer
c40534f466 move stringio class from bugzilla extension into templater module. 2006-05-04 12:02:32 -07:00
Vadim Gelfer
7ff45befff rename [patchbomb] section to [email] section in hgrc. old name still ok. 2006-05-04 12:00:45 -07:00
Vadim Gelfer
901f2c1543 define standard name for base url to use when printing hgweb urls. 
useful for bugzilla integration, email notifications, other stuffs.
 2006-05-04 11:32:00 -07:00
Vadim Gelfer
de8fc55e1f only import mysql module if hook used. 2006-05-03 14:56:07 -07:00
Vadim Gelfer
747e07d661 add bugzilla integration hook. example of writing hook in python. 
hook updates bugzilla bugs when it sees commit comments that mention
bug id, such as "i fixed bug 77".

only bugzilla 2.16 supported yet, but easy to extend. bugzilla versions
have different schema, i have not used later than 2.16.
 2006-05-03 14:40:39 -07:00
Thomas Arendsen Hein
412719cc68 Better help for mq: Corrected synopses, get qcommit options from commands.py. 2006-05-03 11:57:14 +02:00
Thomas Arendsen Hein
092be2daa9 Use better names (hg-{usage}-{random}.{suffix}) for temporary files. 2006-04-30 21:11:22 +02:00
Alexis S. L. Carvalho
2995553eee Fix hg qdiff <file> 2006-04-19 11:41:27 -07:00
Vadim Gelfer
fba6f04a5f mq: do not fail if directory to create exists 2006-04-18 14:56:54 -07:00
Edouard Gomez
f6c00cf208 Register qversion as a non repository related command 2006-04-04 16:35:20 -07:00
Vadim Gelfer
e08da24689 patchbomb: ignore exception if pager quits. 2006-03-09 16:26:49 -08:00
Thomas Arendsen Hein
c6c1b2a975 Removed script header from mq.py 2006-03-08 19:31:54 +01:00
Thomas Arendsen Hein
c8d9d88df5 Moved bisect extension to hgext folder. 2006-03-08 19:30:30 +01:00
Thomas Arendsen Hein
c2f8042cfe Fix mq's usage of opener, which don't allow absolute paths now. 2006-03-07 22:41:24 +01:00
Vadim Gelfer
316fdadb4c only put numbers on patches if > 1 patch. 2006-03-06 21:06:53 -08:00
Lee Cantey
72700213c5 Patchbomb only sends introductory message [0 of N] if there are multiple patches. 2006-03-06 21:05:18 -08:00
Thomas Arendsen Hein
ed3a95a497 Create local ui object per repository, so .hg/hgrc don't get mixed. 
This is needed for hooks, but may be important for other settings, too.
Fixes issue113, also integrated push-hook-lock.sh as a test case for this.
 2006-03-06 17:47:41 +01:00
Vadim Gelfer
30f504a884 get patchbomb extension to use demandload. speeds up hg startup by 50%. 2006-03-02 11:38:39 -08:00
Thomas Arendsen Hein
47314a5f51 Whitespace, tab and formatting cleanups, mainly in mq.py 2006-02-28 23:25:34 +01:00
mason@suse.com
e69cd5f3b2 Add mq extension 2006-02-28 12:25:26 -06:00
Johannes Stezenbach
ebb84bfa68 add --mbox output to patchbomb 
add option to save generated mails in an mbox file for later
processing with formail, instead of sending them directly
 2006-02-06 17:34:39 -06:00
Thomas Arendsen Hein
5402a5485e Removed executable bit from patchbomb extension. 2006-02-03 11:43:49 +01:00
Benoit Boissinot
f35a4401dc extension gpg.py: really raise the exception in case of invalid data 2006-02-02 19:22:27 +01:00
Benoit Boissinot
7993682c87 fix an exception in gpg.py with multiples sigs for the same cset 
- silly error, do not overwrite the variable we use for iterating
- correct 'hg help sign'
 2006-02-01 20:20:27 +01:00
Benoit Boissinot
3c3d3f47d2 fixes for gpg.py extension 
- add copyright and license
- add i18n
- add 'sigs' command behaving like 'hg tags'
- change 'role' to 'comment' and output it only if there is one
- refactoring
 2006-02-01 19:37:26 +01:00
Thomas Arendsen Hein
6e4eeabc49 Added missing space in output of gpg.py 2006-02-01 12:55:01 +01:00
Vadim Gelfer
774f42f23f add documentation for email command. 2006-01-31 08:14:23 -08:00
Vadim Gelfer
fb86f22d15 add _ to several strings 2006-01-31 08:08:43 -08:00
Vadim Gelfer
5ddda972ae turn patchbomb script into an extension module. 
command name is now 'hg email'.
 2006-01-31 08:06:35 -08:00
Thomas Arendsen Hein
f5ef5dad07 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() 2006-01-12 13:35:09 +01:00
Benoit Boissinot
799c1157bf gpg signing extension for hg 
the principle is almost the same as how tags work:
.hgsigs stores signatures, localsigs stores local signatures

the format of the signatures is:
nodeid sigversion base64_detached_sig

sigversion 0 signs simply the nodeid (maybe we would like
to sign other things in the future).

you can associate fingerprints with roles in hgrc like:
[gpg]
fingerprint_of_a_key_without_spaces = release
fingerprint_of_a_key_without_spaces = contributor, testing

the key used for signing can be specified on the command line or
via hgrc (key =)

thanks to Eric Hopper for testing and bugfixing
 2005-12-16 11:12:08 -06:00
Matt Mackall
3e810c442d Re-add hgext/__init__.py 2005-09-29 12:49:01 -07:00
mpm@selenic.com
d6595522d1 Merge with BOS 2005-09-22 09:39:05 -07:00
Bryan O'Sullivan
2f99b73208 Rename mercurial.ext to hgext. 2005-09-21 15:17:24 -07:00