Commit Graph

1019 Commits

Author SHA1 Message Date
Bryan O'Sullivan
3fdd132f7c patchbomb: continue if we can't import readline. 2005-09-04 15:12:20 -07:00
jdc@uwo.ca
0780d896b0 Fix mercurial.el help. 2005-08-31 11:58:15 -07:00
jdc@uwo.ca
cff6ac7682 Adjust hg-strip and hg-chomp regexps. 2005-08-31 11:56:58 -07:00
Bryan O'Sullivan
18fbb99246 Emacs: fix invocations of "hg log" to match current behaviour of log. 2005-08-31 10:54:00 -07:00
TK Soh
c13eeccd08 Regenerate tcsh_completion after bugfix in generator script 2005-08-30 11:22:29 +02:00
TK Soh
b2311cf1a4 tcsh_completion_build.sh: fixed error caused by xargs on Linux 2005-08-30 11:17:20 +02:00
TK Soh
1a860fa9c2 Add tcsh_completion to contrib 2005-08-30 11:16:31 +02:00
TK Soh
cfb26abf9a Add contrib script for generating tcsh completion source 2005-08-30 11:16:31 +02:00
bos@serpentine.internal.keyresearch.com
5bcd6d125f patchbomb: fix up confusion between strings and lists of strings. 2005-08-29 12:15:37 -07:00
Alexis S. L. Carvalho
d3995fac64 bash_completion: try to use bash3 features if they're available
This does NOT break completion for bash 2.05b (I haven't tested
earlier versions)
2005-08-29 20:37:07 +02:00
Alexis S. L. Carvalho
d75704cfb1 bash_completion: small cleanup and bugfix
_hg_count_non_option wasn't taking global options into account
while counting non-option arguments.

It also used only its first argument.
2005-08-29 20:37:07 +02:00
Alexis S. L. Carvalho
098e537d63 teach bash_completion about --cwd 2005-08-29 20:37:07 +02:00
Alexis S. L. Carvalho
c499be626e bash_completion: better handling of aliases
Instead of listing every alias in the big case..esac, use hg help
to get the canonical name of the command.
2005-08-29 20:37:07 +02:00
Alexis S. L. Carvalho
a6928b8448 bash_completion: update for new help output format 2005-08-29 20:37:07 +02:00
Thomas Arendsen Hein
bb21019e04 Make diffstat optional for patchbomb script. 2005-08-28 18:53:43 +02:00
Thomas Arendsen Hein
13d63f534a Variable 'body' was missing in patchbomb script. 2005-08-28 18:52:55 +02:00
mpm@selenic.com
b7bf6330ab patchbomb: eliminate silly complete summary message
No longer makes sense without attachments
2005-08-27 23:10:49 -07:00
mpm@selenic.com
e47546f442 bash_completion: add debugindex and debugdata support 2005-08-27 20:42:53 -07:00
Bryan O'Sullivan
22c1455510 Merge with MPM. 2005-08-24 12:50:11 -07:00
Bryan O'Sullivan
8dbc4cf5bc Get patchbomb working with tip again. 2005-08-24 12:43:09 -07:00
mpm@selenic.com
49b9ae7f87 Add some aliases 2005-08-24 00:12:04 -07:00
Bryan O'Sullivan
00135fa2ee Emacs: implement hg-incoming, hg-outgoing and hg-push. 2005-08-23 21:53:13 -07:00
Bryan O'Sullivan
de1873f73e Emacs: fix up hg-log and hg-diff to operate more uniformly. 2005-08-23 16:46:10 -07:00
Bryan O'Sullivan
a8e6cde878 Merge with MPM. 2005-08-23 15:42:06 -07:00
Bryan O'Sullivan
cc1aaeb8c2 Merge with MPM. 2005-08-23 15:30:06 -07:00
bos@serpentine.internal.keyresearch.com
d2ff3fcc48 Sync buffers prior to doing a diff. 2005-08-23 15:27:17 -07:00
bos@serpentine.internal.keyresearch.com
f58baa49ba Emacs: search for hg in path before looking in funny places. 2005-08-23 14:51:52 -07:00
bos@serpentine.internal.keyresearch.com
3ba9b828ed Emacs: improved GNU Emacs support. 2005-08-22 15:29:55 -07:00
bos@serpentine.internal.keyresearch.com
68be5d4fdf Emacs support: numerous changes.
Most SCM commands now work in derived buffers (e.g. diff viewing
buffers) as well as buffers backed by files.
diff and log now work properly on repositories and files.
Commit support is more solid.
Doc strings are better.
2005-08-22 15:08:20 -07:00
Bryan O'Sullivan
fe8a00152a Emacs: update mode lines properly after commit. 2005-08-22 03:41:09 -07:00
Bryan O'Sullivan
dab396d542 Emacs: kill commit buffer once it's done with. 2005-08-22 03:27:27 -07:00
Bryan O'Sullivan
2ccf192f2f Emacs: first cut at commit support. 2005-08-22 03:16:32 -07:00
Bryan O'Sullivan
0b8a9067ed contrib/patchbomb: Fix buglet with empty cc list. 2005-08-21 23:33:02 -08:00
Bryan O'Sullivan
8c7c780064 Fix handling of addresses in hgrc. 2005-08-21 23:03:14 -08:00
Bryan O'Sullivan
d11b84dd65 Emacs: document existing functions. 2005-08-21 22:46:57 -08:00
Bryan O'Sullivan
b1076155ac Emacs support: add hg-revert-buffer. 2005-08-21 21:51:01 -08:00
mpm@selenic.com
e0aefc415d Make mercurial.el load with GNU emacs 2005-08-19 18:47:05 -08:00
mpm@selenic.com
ac03d564fb Remove -C alias for --cwd 2005-08-19 16:51:44 -08:00
mpm@selenic.com
8414ebc4a3 Merge with TAH 2005-08-19 16:45:25 -08:00
Bryan O'Sullivan
efcb2fa17c In-progress Emacs snapshot. 2005-08-19 06:41:29 -08:00
TK Soh
fe5a0014c8 bash_completion: support GNU sed 3 and non-GNU sed
replaced command 'Q' introduced in GNU sed 4, in order to support
platforms with older sed.
2005-08-19 06:04:46 +01:00
Bryan O'Sullivan
9d3eb87b87 Merge with MPM. 2005-08-18 12:32:15 -08:00
Bryan O'Sullivan
84636de0f5 Initial skeleton for mercurial.el. 2005-08-18 12:27:57 -08:00
mpm@selenic.com
a82d31d71f bash: Add smarter completion of add/commit/remove/forget/diff/revert
Use hg status to determine which files are interesting for various commands.
Thus, hg add [tab] finds unknown files, and hg commit [tab] finds added, modified, or removed files.
2005-08-17 12:22:12 -08:00
mpm@selenic.com
7eaff8988b Add incoming to completions 2005-08-16 19:31:30 -08:00
mpm@selenic.com
f2d463a963 Teach bash_completion about outgoing 2005-08-16 15:55:33 -08:00
mpm@selenic.com
fe60cec7c8 Add bash_completion to contrib
Contributed by "Alexis S. L. Carvalho" <alexis@cecm.usp.br>

Attached is a file that implements bash completion for hg.  Just
reading it from your .bashrc should be enough to use it - I think: I'm
using the /etc/bash_completion from debian and I'm not sure whether it
sets some important option.

It gets the list of commands, aliases and options from the output of hg
help and then adds some specific stuff - e.g. completing update with
tags; pull and push with path aliases and directories, etc.
2005-08-16 14:17:27 -08:00
Bryan O'Sullivan
25693460a9 Polish patchbomb script.
diffstat output is now a non-default option.

The hgrc file can now contain default information for the patchbomb
script.

Date generation is fixed.
2005-08-12 08:04:31 -08:00
Bryan O'Sullivan
6dfde251c1 Get patchbomb script to not use MIME attachments.
Adding patches as attachments makes it difficult or impossible for some
mail clients to quote them effectively.
2005-08-09 20:53:50 -08:00
Bryan O'Sullivan
e9b1d4e478 Add patchbomb script. 2005-08-09 20:18:58 -08:00
mason@suse.com
c0fbfaefff Change hgit revision lookup to use repo.lookup 2005-07-19 12:41:08 -05:00
mason@suse.com
46d7cac948 Fix hgit usage of repo.changes and fancyopts to reflect current hg api 2005-07-19 12:40:46 -05:00
mpm@selenic.com
b154d7476b Teach convert-repo about tags
Git tags are bad, very bad. More importantly, they're horribly
inconsistent. This drops tags which don't appear to work like most of
the others.

manifest hash: f2dda9e9a3ae8a0d84b19e496059b8a795b8e603
2005-07-14 22:37:46 -08:00
mpm@selenic.com
e8f66f8f04 convert-repo: deal with packed git and other fixes
call out to git-cat-file directly to deal with packed files
use git-diff-tree --root to handle import of first commit
quiet some dirstate warnings
fix parent logic in commit
whitespace bits
topological sort fix

manifest hash: 2943af0168dd2f5e85bba6515fd08687e264863f
2005-07-13 01:53:27 -08:00
mpm@selenic.com
1595427d02 [PATCH] Add contrib/buildrpm script
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH] Add contrib/buildrpm script

From: Bryan O'Sullivan <bos@serpentine.com>

Just run "buildrpm", and it builds an RPM for you.  No funky monkey
business required.

manifest hash: b8fde5108b5cc8f49ce248d14ac2ee7ad004c91c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCxb6sywK+sNU5EO8RApQZAJ94VD6NQr9l4Xx6w3S8EdpCIUuiIACfdoHA
qnQWtMM+kqAzi3LnO92UYWE=
=SWIO
-----END PGP SIGNATURE-----
2005-07-01 14:07:40 -08:00
mpm@selenic.com
3359129ba8 [PATCH] clean up RPM spec file
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH] clean up RPM spec file

From: Bryan O'Sullivan <bos@serpentine.com>

The current RPM spec file makes it impossible to split Mercurial into
multiple interdependent packages.  Here's a patch that fixes that
problem.

manifest hash: 4acc4c5cf4485d92a32d2259b83314b7167dece3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCxb2+ywK+sNU5EO8RAnrTAJ4tkAh6xnHvRHMxzrfqKb/SXYS2wwCeMfK1
PAr+1FFoSqUmA9rt8Yaw6f4=
=MaPn
-----END PGP SIGNATURE-----
2005-07-01 14:03:42 -08:00
mpm@selenic.com
64a7a0dd00 Add an RPM spec file
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Add an RPM spec file

manifest hash: 4b0a028ee71e7bf1faa4fd6fe0d9efce0b04bf3a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCvP1jywK+sNU5EO8RAiWVAJ9083+cHfhDn4kjnULikci6nQEvMACdFGyg
1Lv0tujumR2E9lvFe2c4eIw=
=kKKS
-----END PGP SIGNATURE-----
2005-06-24 22:44:51 -08:00
mpm@selenic.com
755400915e Get set_exec from util in convert_repo
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Get set_exec from util in convert_repo

manifest hash: 82fa9db49fa56127d59a7aae70b3c0527420ddad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCu2LTywK+sNU5EO8RAjBwAJ4+8ME5PPzQumB4u8R0zpX84tqm8QCgqhzE
cd83i0X45u09mKFNFruaHYY=
=9LfW
-----END PGP SIGNATURE-----
2005-06-23 17:33:07 -08:00
mpm@selenic.com
5659821616 convert-repo fixups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

convert-repo fixups

- - deal with octopus merge
  uniqueify parent list
  add a series of identical commits with "(octopus merge fixup)"
- - add "committer" field from git to the commit message

manifest hash: e33d802afe35edecfc5cc9b567def6db2b0cb885
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCubogywK+sNU5EO8RAkWgAJ9OVHeumKd/nRIfvS/nQ9eSbORqNgCgpBIE
Dza0L59OSJHHmm3Dbp7ygds=
=OEvJ
-----END PGP SIGNATURE-----
2005-06-22 11:21:04 -08:00
mpm@selenic.com
54a3fc9141 [PATCH] Using monotone-viz/git-viz with mercurial
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH] Using monotone-viz/git-viz with mercurial

From: Vincent Danjean <vdanjean.ml@free.fr>

  monotone-viz is a small GTK+ application that visualizes monotone
ancestry graphs. Its home page is:
http://oandrieu.nerim.net/monotone-viz/
  As monotone and git are similar, the author adapted the 0.9 version to
display git ancestry graphs and call it git-viz. I cannot see any link
from the homepage, but looking in the archive of git ML, it can be found
here:
http://oandrieu.nerim.net/monotone-viz/git-viz-0.1.tar.gz

  I few days ago, I adapted it so that it works with the last versions
of git/cogito. Patches and package are available here:
http://dept-info.labri.fr/~danjean/deb.html#git-viz

  Today, I patched hgit so that it respects the output of git-diff-tree,
I added git-{diff-tree,cat-file,rev-list,rev-tree} that call hgit (2
lines scripts), and added the script 'hg-viz'.
  hg-viz create a .git directory and store the SHA1 of the tip in
.git/HEAD and then call my git-viz.
  All these modifications are in the attached patch.

  I try it in the mercurial repository. After applying the patch, you
just have to add the contrib directory in your PATH and call hg-viz.
  An example of what we can see is on my web page (probably not for a
long time) : http://dept-info.labri.fr/~danjean/temp/hg-viz.png

  Vincent

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuM50ywK+sNU5EO8RAtlvAJ425JJI9chCdSi8D+R2Af/vJEOUpACffC9e
fxjJ3umBkffj5g86jWaRGZ0=
=LwA2
-----END PGP SIGNATURE-----
2005-06-21 18:35:32 -08:00
Thomas Arendsen Hein
878eebd88e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Changes from the original patch:
- - Use 'diff -r ...' instead of 'hg diff -r ...' to support filetype detection
  by at least file(1) and vim.
- - Adjusted tests for this change.
- - Some cleanups.

manifest hash: 5f37d1ef75ea7f4e48b53f02371053ba54fb70f8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCsyZzW7P1GVgWeRoRAqczAJ479lR9Z289sP+VH5L+N7pQRU14SACfUueq
88ABloIR3VyRIa4qbujnZio=
=Vva9
-----END PGP SIGNATURE-----
2005-06-17 20:37:23 +01:00
mpm@selenic.com
69c0c6f65d [PATCH] Update hgit to the new commands.dodiff parameters
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH] Update hgit to the new commands.dodiff parameters

From: Chris Mason <mason@suse.com>

Update hgit to the new commands.dodiff parameters

manifest hash: aa8d98036fae49ab1c1c0e65d86ab0e1bee0fa71
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCsG35ywK+sNU5EO8RAhnoAJwMgK1QA8DkdbU2R19LoLRK1fmCaQCeN1dh
4fHRT4hf+Qi5fND4CpOyqBU=
=63xo
-----END PGP SIGNATURE-----
2005-06-15 10:05:45 -08:00
mpm@selenic.com
a29e708dae hgit rev-list support
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

hgit rev-list support

From: Chris Mason <mason@suse.com>

Update hgit rev-list support, make it a special case of hgit rev-tree

Print newest commit first
Add the ability to specify the max number of commits to print (-n or --max-nr=)
Match git feature of stopping at a given commit (hgit rev-list start_commit sto\p_commit)

manifest hash: b9bbd5e95dae771ebef89f8f4102e458052b1835
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCsG26ywK+sNU5EO8RAm5OAJ46G1nhXN2kQ+cKaBOK+oX4zSdQRgCdECvG
6wbG0JRdm7S29K4ynzs4cyY=
=pwpz
-----END PGP SIGNATURE-----
2005-06-15 10:04:42 -08:00
mpm@selenic.com
5e867e4ad4 hgit: remove tabs
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

hgit: remove tabs

- From Chris Mason

manifest hash: 68e016c1bbaaebed60ab9755fd054b95dae7263a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCr1RfywK+sNU5EO8RAjWBAKCMhIYjj/wOIvztLyoOjeuKMSSvLgCePIuD
Mm44JPLF9xegWFyOgB7QVoA=
=eEHJ
-----END PGP SIGNATURE-----
2005-06-14 14:04:15 -08:00
mpm@selenic.com
de605e68a0 Add new convert-repo script
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Add new convert-repo script

This is the beginnings of a generalized framework for converting
repositories. Currently hardwired to convert from git to hg.

manifest hash: dc3b72de2c45bfdaffcc1cf71da530228793facd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCrGf/ywK+sNU5EO8RAi9EAJ0eQ++cwSgn5j2PHiTvF7r3JNiv4gCePY+X
do12pUvCczyBKVCoBN7y/uI=
=YtzI
-----END PGP SIGNATURE-----
2005-06-12 08:51:11 -08:00
mpm@selenic.com
1132fd6ccd minor hgk fixes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

minor hgk fixes

From: Chris Mason <mason@suse.com>

hgk was missing the last commit when reading the output from hgit rev-list -c

Some how a debugging puts snuck into the hgk I sent out.  Remove it:

manifest hash: cc0ec1d46fbbe9b7e9bf6404f9dbe2ec787811ba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCp13mywK+sNU5EO8RAnkqAJ49W/i1mwt38Yws4t0mEQeKttsOSQCgi9fS
/t42Uy0Qj9yeVppGPLel/bI=
=eIrI
-----END PGP SIGNATURE-----
2005-06-08 13:06:46 -08:00
mpm@selenic.com
9cb4207872 Mark the usual things executable
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mark the usual things executable

manifest hash: e55dde46fd1a97ce338c1ac71278b67ca9d96bf7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCpz5RywK+sNU5EO8RAnypAJwLpjrQ09nMSJUELtCondHI0fvuVACfQu2J
mFi9D3L9ULGO457NWB4h3kY=
=3bcD
-----END PGP SIGNATURE-----
2005-06-08 10:52:01 -08:00
mpm@selenic.com
22f0ea87bb [PATCH] hgk should parse dates in the diff output
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH] hgk should parse dates in the diff output

hgk doesn't deal well with the difflib style diffs, it expects the filename
to be the last thing on the line.  This patch fixes the regexp to stop
reading the filename at the first tab.

Signed-off-by: Chris Mason <mason@suse.com>

manifest hash: 9c5bcf427455dcf306ab6f91b1986723caa83f36
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCpl/HywK+sNU5EO8RAgAjAKCOuZsRtJDbdurTQry+7krtLTtRQQCfXLuN
LZEFkcOGS0jiAC6vci/RLJ0=
=jkr1
-----END PGP SIGNATURE-----
2005-06-07 19:02:31 -08:00
mpm@selenic.com
4948aa3074 Initial import of hgit and hgk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Initial import of hgit and hgk

Support for git compatibility sufficient to run gitk on top of hg
repositories.  This includes:

hgit diff-tree
hgit rev-list
hgit rev-tree
hgit cat-file

Signed-off-by: Chris Mason <mason@suse.com>

hgk is a slightly modified version of gitk1.1 from Paul Mackerras.  It has
been changed to use hgit commands, and has support for the extended
rev-list -c to speed up the commit listing.

Signed-off-by: Chris Mason <mason@suse.com>

manifest hash: 5a4a27135bc85bab2a3a1e35018a08a985d8d146
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCpVQ4ywK+sNU5EO8RAl3QAJ9p6VyZ8fCHfgt0p8ksgL2P215DXQCfZU47
d+u5GpZvkOTOc3+LU3Ny3nE=
=rjsC
-----END PGP SIGNATURE-----
2005-06-07 00:00:56 -08:00