# # # patch "ChangeLog" # from [32a3e4ff36dcb1441bae18c1335758885f9ed5d5] # to [6706ba8484542fc4c939bda07422e370198b286d] # # patch "contrib/mtbrowse.sh" # from [ebb5d735eb467fa811266dff58d0e7c2b9543a54] # to [2a9704fcdeaf79fa561666d2a00c79029d87de96] # ============================================================ --- ChangeLog 32a3e4ff36dcb1441bae18c1335758885f9ed5d5 +++ ChangeLog 6706ba8484542fc4c939bda07422e370198b286d @@ -1,3 +1,7 @@ +2006-04-11 Henry Nestler
+ + * contrib/mtbrowse.sh: Binary call to mtn + 2006-04-11 Richard Levitte * netxx/resolve_getaddrinfo.cxx (resolve_hostname): monotone might ============================================================ --- contrib/mtbrowse.sh ebb5d735eb467fa811266dff58d0e7c2b9543a54 +++ contrib/mtbrowse.sh 2a9704fcdeaf79fa561666d2a00c79029d87de96 @@ -22,7 +22,7 @@ # - Browse in branches, revisions, diff files, view logs ... # # Needed tools: -# monotone 0.19, 0.23, 0.26 or compatible +# Monotone 0.19, 0.23, mtn 0.26 or compatible # dialog (tested Version 0.9b) # bash, sh, dash # less, vi or vim (use $VISUAL or $PAGER) @@ -129,12 +129,18 @@ # 2006-04-01 Version 0.2.0 address@hidden # Handle bookkeeping directory MT and _MTN # Move checking bookkeeping directory behind versions check. +# +# 2006-04-10 Version 0.2.1 address@hidden +# Binary is mtn, set by MTN, with fallback to 'monotone'. # Known Bugs / ToDo-List: # * better make "sed -n -e '1p'" for merge two different branches. -VERSION="0.2.0" +VERSION="0.2.1" +# Binary +MTN="mtn" + # Save users settings # Default values, can overwrite on .mtbrowserc CONFIGFILE="$HOME/.mtbrowserc" @@ -274,7 +280,7 @@ short_hash=`echo $hash | cut -c 1-$HASH_TRIM` # get certs of revision, remove special chars, cache it - monotone --db=$DB list certs $hash | tr '\\\t\042' '/ \047' > $tfc + $MTN --db=$DB list certs $hash | tr '\\\t\042' '/ \047' > $tfc # Date format case $FORMAT_DATE in @@ -395,7 +401,7 @@ # e51dc90425c6371a176e87df294b47fcdba3f0bb Full Name 2005-11-20T20:31:34 mtbrowse lineno=0 - monotone log --brief --last=$CERTS_MAX --revision=$HEAD --db=$DB |\ + $MTN log --brief --last=$CERTS_MAX --revision=$HEAD --db=$DB |\ while read line do lineno=$(( $lineno+1 )) @@ -537,7 +543,7 @@ if [ ! -f $TEMPFILE.branches -o $DB -nt $TEMPFILE.branches \ -o "$CACHE" != "1" ] then - monotone --db=$DB list branches \ + $MTN --db=$DB list branches \ | sed -n -r -e 's/^(.+)$/\1\t-/p' > $TEMPFILE.branches \ || exit 200 fi @@ -577,7 +583,7 @@ return fi - if ! monotone --db=$DB automate heads $BRANCH > $TEMPFILE.heads 2>$TEMPFILE.error + if ! $MTN --db=$DB automate heads $BRANCH > $TEMPFILE.heads 2>$TEMPFILE.error then cat $TEMPFILE.error exit -1 @@ -589,7 +595,7 @@ HEAD=`head -n 1 < $TEMPFILE.heads` else # List heads with author and date. Select by user. - monotone --db=$DB heads --branch=$BRANCH \ + $MTN --db=$DB heads --branch=$BRANCH \ | sed -n -r -e 's/^([^ ]+) ([^ ]+) ([^ ]+)$/\1 \"\2 \3\"/p' \ | xargs dialog --begin 1 2 --menu "Select head" 0 0 0 \ 2> $TEMPFILE.input @@ -626,14 +632,14 @@ # LOG # 0.19 monotone log --depth=n id file # 0.19+ monotone log --last=n id file - monotone --db=$DB log $DEPTH_LAST=1 --revision=$REVISION \ + $MTN --db=$DB log $DEPTH_LAST=1 --revision=$REVISION \ > $TEMPFILE.change.log || exit 200 do_pager $TEMPFILE.change.log ;; P) # DIFF parent - monotone --db=$DB automate parents $REVISION > $TEMPFILE.parents + $MTN --db=$DB automate parents $REVISION > $TEMPFILE.parents if [ `wc -l < $TEMPFILE.parents` -ne 1 ] then @@ -662,7 +668,7 @@ then dialog --msgbox "No parent found\n$REVISION" 6 45 else - monotone --db=$DB diff \ + $MTN --db=$DB diff \ --revision=$PARENT --revision=$REVISION \ > $TEMPFILE.parent.diff || exit 200 do_pager $TEMPFILE.parent.diff @@ -670,7 +676,7 @@ ;; W) # DIFF - # monotone diff --revision=id + # $MTN diff --revision=id if [ "$HEAD" = "$REVISION" ] then dialog --msgbox "Can't diff with head self\n$HEAD" 6 45 @@ -678,13 +684,13 @@ # exist working copy? if [ -f $BK_DIR/options ] then - monotone --db=$DB diff \ + $MTN --db=$DB diff \ --revision=$REVISION \ > $TEMPFILE.cwd.diff || exit 200 else # w/o MT dir don't work: # Help MT with HEAD info ;-) - monotone --db=$DB diff \ + $MTN --db=$DB diff \ --revision=$HEAD --revision=$REVISION \ > $TEMPFILE.cwd.diff || exit 200 fi @@ -701,8 +707,8 @@ then REV2=`cat $TEMPFILE.revision-select` - # monotone diff --revision=id1 --revision=id2 - monotone --db=$DB diff \ + # $MTN diff --revision=id1 --revision=id2 + $MTN --db=$DB diff \ --revision=$REV2 --revision=$REVISION \ > $TEMPFILE.ref.diff || exit 200 do_pager $TEMPFILE.ref.diff @@ -711,7 +717,7 @@ ;; C) # List certs - monotone --db=$DB list certs $REVISION > $TEMPFILE.certs.log \ + $MTN --db=$DB list certs $REVISION > $TEMPFILE.certs.log \ || exit 200 do_pager $TEMPFILE.certs.log ;; @@ -719,7 +725,7 @@ # List changed files # 0.22: monotone cat revision