|
Size: 5035
Comment:
|
Size: 4423
Comment: simpler version with encode filter only and just 1 script
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 69: | Line 69: |
| to CVS) with [decode] and [encode] filters, and the pretxncommit-hook. This comes in handy when you want to keep track of different file revisions in the same repository. |
to CVS) with an [encode] filter and the pretxncommit-hook. Comes in handy when you want to keep track of different file revisions in the same repository. |
| Line 73: | Line 73: |
| For demonstration we use just one keyword: "Hg". As [decode] and [encode] work only on a stream you'll have to include the filename ''manually'' once. |
For demonstration we use just one keyword: "Hg". |
| Line 76: | Line 75: |
| Accepted formats are: | * {{{$Hg$}}} |
| Line 78: | Line 77: |
| * {{{$Hg$}}} (without filename "expansion") * {{{$Hg: <filename>,v$}}} |
It will be expanded by the script "hgpretxncommit.sh" (see below) to: |
| Line 81: | Line 79: |
| You also have the choice between two date output formats: | * {{{$Hg: <basename of file>,v <short hash> <date> $}}} You have the choice between two date output formats: |
| Line 84: | Line 84: |
| * YYYY/mm/dd (called 'slashday' here) | * YYYY/mm/dd |
| Line 86: | Line 86: |
| With the scripts called "hgfilter.sh" and "hgpretxncommit.sh" put in your $PATH a simple setup could have the following entries in hgrc: |
You need an [encode] filter that "reverts" the expansion in your hgrc (unless you don't care about the expanded keyword showing up in every "hg diff"). Simple example hgrc for a repository containing python files: |
| Line 90: | Line 92: |
| [decode] *.txt = hgfilter.sh decode *.py = hgfilter.sh decode slashday |
|
| Line 94: | Line 93: |
| *.txt = hgfilter.sh *.py = hgfilter.sh |
*.py = sed 's/[$]Hg[^$]*[$]/\$Hg\$/' |
| Line 100: | Line 98: |
| Here's the filter script "hgfilter.sh": {{{ #!/bin/sh set -e decode= slashday= for i; do case "$i" in decode) decode=true; shift ;; slashday) slashday=true; shift ;; esac done if [ "$decode" ]; then if (($# == 0)); then tip=`hg tip` cset=`echo "$tip" | awk -F ':' '/^changeset: +/ { print $3 }'` else tip="$@" cset="${HG_NODE:0:12}" fi if [ "$slashday" ]; then hgdate=`echo "$tip" | awk '/^date: +/ { printf "%d/%s/%0.2d %s %s", $6, $3, $4, $5, $7 }'` m=0 for M in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec do let $((++m)) hgdate=${hgdate/$M/`printf %0.2d $m`} done else hgdate=`echo "$tip" | awk -F ': +' '/^date: +/ { print $2 }'` fi sed -e "s!\([$]Hg\)\(:\( [^,]\{1,\},v\)\)\{0,1\}[$]!\1:\3 $cset $hgdate \$!" else sed -e 's!\([$]Hg\(: [^,]\{1,\},v\)\{0,1\}\)[^$]*[$]!\1\$!' fi exit $? }}} |
|
| Line 141: | Line 99: |
| according to your needs. Supposing above [decode] settings in hgrc the 'slash' pattern includes files with suffix ".py". |
according to your needs. The script doesn't look at files matching $excl. Whereas files not matching $excl but matching $slash will have the commit date expanded as YYYY/mm/dd (like the python files in this example). |
| Line 148: | Line 107: |
| sl="" | |
| Line 150: | Line 108: |
| slash='\.\(tex\|s\(ty\|h\)\|c\(fg\|ls\)\|bib\|py\|awk\)$' | slash='\.\(\(te\|dt\)x\|s\(ty\|h\)\|c\(fg\|ls\)\|bib\|py\|awk\)$' cset="${HG_NODE:0:12}" |
| Line 153: | Line 112: |
| dateformat() { local m M if echo "$f" | grep -q "$slash"; then hgdate=`echo "$tipv" | awk '/^date: +/ { printf "%d/%s/%0.2d %s %s", $6, $3, $4, $5, $7 }'` m=0 for M in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec do let $((++m)) hgdate=${hgdate/$M/`printf %0.2d $m`} done else hgdate=`echo "$tipv" | awk -F ': +' '/^date: +/ { print $2 }'` fi } |
|
| Line 155: | Line 129: |
| if echo "$f" | grep -v -q "$excl" && echo "$manifest" | grep -x -q "$f" then echo "$f" | grep -q "$slash" && sl='slashday' hg cat "$f" | hgfilter.sh decode $sl "$tipv" > "$f" fi |
if echo "$f" | grep -v -q "$excl" && echo "$manifest" | grep -x -q "$f" then bn="${f##*/}" dateformat hg cat "$f" | sed "s!\([$]Hg\)[^$]*[$]!\1: ${bn},v $cset $hgdate \$!" > "$f" fi |
Available tips: TableOfContents
Make a clean copy of a source tree, like CVS export
hg clone source export rm -rf export/.hg
The same thing, but for a tagged release
hg clone --noupdate source export-tagged cd export-tagged hg update mytag rm -rf .hg
See diffs when editing commit message with VIM
Make a private copy of the 'hgeditor' script provided with mercurial and replace the call to the editor with following command:
vim "+e $HGTMP/diff" '+set buftype=help filetype=diff' "+vsplit $HGTMP/msg" || exit $?
This will start up VIM in vertical split mode with commit message in the left pane and diff in the right pane. The buftype=help setting for diff window tells vim to exit when all other windows are closed, so when you write and quit the log with :x (:wq - they are equivalent), vim exits. If you have syntax highlight set up, the diff will be properly highlighted.
This setting is suitable for wide terminals. If you have a narrow terminal, you may want to replace the +vsplit above with +split or add nowrap to the +set.
See diffstat of pulled changes
Place the following script (named "pull-diffstat" here) somewhere in your $PATH:
test -n "$NODE" || exit 0
PARENT=`hg parents $NODE | head -1 | awk -F':' '{print $3}'`
TIP=`hg tip | head -1 | awk -F':' '{print $3}'`
echo "diffstat for $PARENT to $TIP"
hg diff -r $PARENT -r tip | diffstatAdd a changegroup entry to the [hooks] section of hgrc:
[hooks] changegroup = pull-diffstat
Now you will see a diffstat of the new changes to your repo every time you do "hg pull".
One liner to remove unknown files with a pattern
To make these work, replace the ls -l with the command you wish to execute (ie. rm). You can also tweak the parameters passed to hg status to filter by something other than unknown files (see hg help status).
hg status -nu0 | grep -z pattern | xargs -0r ls -l
The above command requires a current version of GNU grep. If you don't have one, you can use the following:
hg status -nu | grep pattern | tr '\n' '\0' | xargs -0r ls -l
Keyword expansion according to file revision
This is an example on how you can achieve filewise keyword expansion (similar to CVS) with an [encode] filter and the pretxncommit-hook. Comes in handy when you want to keep track of different file revisions in the same repository.
For demonstration we use just one keyword: "Hg".
$Hg$
It will be expanded by the script "hgpretxncommit.sh" (see below) to:
$Hg: <basename of file>,v <short hash> <date> $
You have the choice between two date output formats:
- Generic Mercurial output
- YYYY/mm/dd
You need an [encode] filter that "reverts" the expansion in your hgrc (unless you don't care about the expanded keyword showing up in every "hg diff").
Simple example hgrc for a repository containing python files:
[encode] *.py = sed 's/[$]Hg[^$]*[$]/\$Hg\$/' [hooks] pretxncommit = hgpretxncommit.sh
In "hgpretxncommit.sh" you have to tweak the 'excl' and 'slash' variables according to your needs. The script doesn't look at files matching $excl. Whereas files not matching $excl but matching $slash will have the commit date expanded as YYYY/mm/dd (like the python files in this example).
set -e
test $? -eq 0 || exit 1
excl='^\.hg\|\.\(p\(df\|ng\)\|jpg\)$'
slash='\.\(\(te\|dt\)x\|s\(ty\|h\)\|c\(fg\|ls\)\|bib\|py\|awk\)$'
cset="${HG_NODE:0:12}"
tipv=`hg tip --verbose`
manifest=`hg manifest | cut -d ' ' -f 3`
dateformat() {
local m M
if echo "$f" | grep -q "$slash"; then
hgdate=`echo "$tipv" |
awk '/^date: +/ { printf "%d/%s/%0.2d %s %s", $6, $3, $4, $5, $7 }'`
m=0
for M in Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec
do
let $((++m))
hgdate=${hgdate/$M/`printf %0.2d $m`}
done
else
hgdate=`echo "$tipv" | awk -F ': +' '/^date: +/ { print $2 }'`
fi
}
for f in `echo "$tipv" | awk -F ': +' '/^files: +/ { print $2 }'`
do
if echo "$f" | grep -v -q "$excl" && echo "$manifest" | grep -x -q "$f"
then
bn="${f##*/}"
dateformat
hg cat "$f" |
sed "s!\([$]Hg\)[^$]*[$]!\1: ${bn},v $cset $hgdate \$!" > "$f"
fi
done
exit $?