From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 12 Sep 2007 00:09:14 +0400 From: Alexey Tourbin To: ALT Linux Team development discussions Message-ID: <20070911200914.GT6051@solemn.turbinal> Mail-Followup-To: ALT Linux Team development discussions References: <20070911164328.GP6051@solemn.turbinal> <200709111955.41007.ledest@gmail.com> <20070911171934.GA19827@hell.fortress> <200709112027.50574.ledest@gmail.com> <20070911192054.GR6051@solemn.turbinal> <9713cfcc0709111255p13d852d6ka5ff5e441b4cf224@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="kqY5KO+rxsrm5KML" Content-Disposition: inline In-Reply-To: <9713cfcc0709111255p13d852d6ka5ff5e441b4cf224@mail.gmail.com> Subject: Re: [devel] jakarta-commons-latka-0:1.0-alt2_0.r389670.2jpp1.7 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Sep 2007 20:09:31 -0000 Archived-At: List-Archive: List-Post: --kqY5KO+rxsrm5KML Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Sep 11, 2007 at 10:55:20PM +0300, Led wrote: > 2007/9/11, Alexey Tourbin : > > On Tue, Sep 11, 2007 at 08:27:50PM +0300, Led wrote: > > > =FC=D4=CF =D3=C5=D2=D8=A3=DA=CE=CF =D0=C5=D2=C5=CC=CF=D0=C1=DE=C9=D7= =C1=D4=D8 shell-=D3=CB=D2=C9=D0=D4=D9, =CB=CF=D4=CF=D2=D9=C8 =CD=CF=D6=C5= =D4 =C2=D9=D4=D8 =D7 =D0=C1=D5=CB=C5=D4=C5 "=CE=C5 > > > =CF=C4=C9=CE" =C9 "=CE=C5=CD=C1=CC=C5=CE=D8=CB=C9=CA". =F7 =DC=D4=CF= =CD =D3=CC=D5=DE=C1=C5 =D2=C1=DA=C7=CF=D7=CF=D2 =CF =D0=CF=C9=D3=CB=C5 > > > exec ... > > > > =F5=D7=D9, =C2=D9=D7=C1=C0=D4 =C4=C5=CA=D3=D4=D7=C9=D4=C5=CC=D8=CE=CF "= =CB=D2=C9=D7=CF=D7=C1=D4=D9=C5" =D3=CB=D2=C9=D0=D4=D9, =C4=C1 =C9 =CE=C5 = =D3=CF=D7=D3=C5=CD > > =CB=D2=C9=D7=CF=D7=C1=D4=D9=C5, =D7 =CB=CF=D4=CF=D2=D9=C8 =D0=CF=C9=D3= =CB =DA=C1=D7=C9=D3=C9=CD=CF=D3=D4=C5=CA =C4=C1=C5=D4 =D3=CC=C9=DB=CB=CF=CD= =CD=CE=CF=C7=CF =D2=C5=DA=D5=CC=D8=D4=C1=D4=CF=D7. > > =F7=D3=A3 =D6=C5 =D3=D4=CF=C9=D4 =D0=CF=D0=D9=D4=C1=D4=D8=D3=D1 =D7=D9= =D1=D3=CE=C9=D4=D8, =CD=CE=CF=C7=CF =CC=C9 =D4=C1=CD =D0=C5=D2=C5=CC=CF=D0= =C1=DE=C9=D7=C1=D4=D8 =C9=CC=C9 =CE=C5=D4. >=20 > =E2=D9=D7=C1=C0=D4 =C9 "=CB=D2=C9=D7=CF=D7=C1=D4=C9=C5"... =EE=CF, =D7=D3= =A3 =D6=C5, =D0=C5=D2=C5=C4=C5=CC=D9=D7=C1=D4=D8 > /usr/bin/foo > =CE=C1 > FOO=3D/usr/bin/foo > $FOO > ? > =E9=ED=E8=EF =DC=D4=CF =CE=C5 =C9=D3=D0=D2=C1=D7=CC=C5=CE=C9=C5 "=CB=D2= =C9=D7=CF=D3=D4=C5=CA", =C1 "=D2=C1=D3=D3=D4=C1=CE=CF=D7=CB=C1 =CB=CF=D3=D4= =D9=CC=C5=CA" (?) =F5=D7=D9, =D1 =D4=CF=D6=C5 =D3=CD=CF=D4=D2=C0 =CE=C1 =DC=D4=CF =CB=C1=CB = =CE=C1 =D2=C1=D3=D3=D4=C1=CE=CF=D7=CB=D5 =CB=CF=D3=D4=D9=CC=C5=CA. =F3 =C4= =D2=D5=C7=CF=CA =D3=D4=CF=D2=CF=CE=D9, =D4=C1=CB =CD=CF=D6=CE=CF =C4=CF=C7=CF=D7=CF=D2=C9= =D4=D8=D3=D1 =C4=CF =D4=CF=C7=CF, =DE=D4=CF =CE=D5=D6=CE=CF =D0=CF=C8=C5=D2= =C9=D4=D8 =D7=D3=C0 =C9=C4=C5=C0 =C1=D7=D4=CF=CD=C1=D4=C9=DE=C5=D3=CB=CF=C7=CF =D0=CF=C9=D3=CB=C1 =DA=C1=D7= =C9=D3=C9=CD=CF=D3=D4=C5=CA -- =D0=D2=CF=D3=D4=CF =D0=CF=D4=CF=CD=D5, =DE= =D4=CF =D3=D5=DD=C5=D3=D4=D7=D5=C0=D4 =D5=D3=CC=CF=D7=CE=D9=C5 =DA=C1=D7=C9=D3=C9=CD=CF=D3=D4=C9. =EF=CE=C9 =D3= =D5=DD=C5=D3=D4=D7=D5=C0=D4 =CE=C5 =D4=CF=CC=D8=CB=CF =D7 =DB=C5=CC=CC=C5, = =CE=CF =C9 =D7 =C4=D2=D5=C7=C9=C8 =C9=CE=D4=C5=D0=D2=C5=D4=C9=D2=D5=C5=CD=D9=C8 =D1=DA=D9=CB=C1=C8. =F0=D2= =CF=D3=D4=CF =D7 =DB=C5=CC=CC=C5 =D3 =CE=C9=CD=C9 =D3=CC=CF=D6=CE=C5=C5 =C2= =CF=D2=CF=D4=D8=D3=D1. =F7 =CE=C5=CB=CF=D4=CF=D2=D9=C8 =D3=CC=D5=DE=C1=D1=C8 =CF=DE=C5=CE=D8 =D4= =D1=D6=C5=CC=CF =D3=CB=C1=DA=C1=D4=D8, =D3=D4=CF=C9=D4 =CC=C9 =D2=C1=D3=D3= =D4=C1=D7=CC=D1=D4=D8 =CB=CF=D3=D4=D9=CC=C9, =C9=CC=C9 =D0=D2=CF=DD=C5 =CF=D4=CB=CC=C0=DE=C9=D4=D8 =D0=CF=C9=D3=CB =DA= =C1=D7=C9=D3=C9=CD=CF=D3=D4=C5=CA =D7 =CB=CF=CE=CB=D2=C5=D4=CE=CF=CD =C6=C1= =CA=CC=C5. =F3=CD. =CE=C1=D0=D2. git.git v1.5.1.1-113-g6fcc309 (=CE=C9=D6=C5 =C3=C5=CC=C9=CB=CF=CD). =EE=CF =CF=D4=CB=CC=C0=DE=C9=D4=D8 =D0=CF=C9=D3=CB =DA=C1=D7=C9=D3=C9=CD=CF= =D3=D4=C5=CA =D7 =CF=D4=C4=C5=CC=D8=CE=CF =D7=DA=D1=D4=CF=CD =C6=C1=CA=CC= =C5, =C5=D3=CC=C9 =D3=D9=D3=CB=C1=CC=C1=D3=D8 =D0=C1=D2=DB=C9=D7=C1=D1 =CF=D7=C3=C1, =D7=D0=CF=CC=CE=C5 =D3=C5=C2=C5 =CD= =CF=D6=CE=CF: %add_findreq_skiplist %_bindir/=CF=D7=C3=C1 =EB =D3=CF=D6=C1=CC=C5=CE=C9=C0, =D0=CF=CB=C1 =CE=C5=D4 =D3=D0=CF=D3=CF=C2= =C1 =C9=C7=CE=CF=D2=C9=D2=CF=D7=C1=D4=D8 =D3=C1=CD=C9 =DA=C1=D7=C9=D3=C9=CD= =CF=D3=D4=C9 =CF=D0=D2=C5=C4=C5=CC=C5=CE=CE=CF=C7=CF =D7=C9=C4=C1. commit 6fcc3098dc58239f3437779740efee7a5c87ae20 Author: Dmitry V. Levin Date: Thu Apr 12 13:26:49 2007 +0000 git-mergetool.sh: Protect merge tool names from "sh --find-requires" diff --git a/git-mergetool.sh b/git-mergetool.sh index e62351b..4db2a80 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -191,10 +191,10 @@ merge_file () { case "$merge_tool" in kdiff3) if base_present ; then - (kdiff3 --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remo= te)" \ + ($merge_tool --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path = (Remote)" \ -o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1) else - (kdiff3 --auto -L1 "$path (Local)" --L2 "$path (Remote)" \ + ($merge_tool --auto -L1 "$path (Local)" --L2 "$path (Remote)" \ -o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1) fi status=3D$? @@ -202,9 +202,9 @@ merge_file () { ;; tkdiff) if base_present ; then - tkdiff -a "$BASE" -o "$path" -- "$LOCAL" "$REMOTE" + $merge_tool -a "$BASE" -o "$path" -- "$LOCAL" "$REMOTE" else - tkdiff -o "$path" -- "$LOCAL" "$REMOTE" + $merge_tool -o "$path" -- "$LOCAL" "$REMOTE" fi status=3D$? save_backup @@ -218,13 +218,13 @@ merge_file () { xxdiff) touch "$BACKUP" if base_present ; then - xxdiff -X --show-merged-pane \ + $merge_tool -X --show-merged-pane \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$path" -- "$LOCAL" "$BASE" "$REMOTE" else - xxdiff -X --show-merged-pane \ + $merge_tool -X --show-merged-pane \ -R 'Accel.SaveAsMerged: "Ctrl-S"' \ -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl-G"' \ @@ -236,18 +236,18 @@ merge_file () { opendiff) touch "$BACKUP" if base_present; then - opendiff "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$path" | cat + $merge_tool "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$path" | cat else - opendiff "$LOCAL" "$REMOTE" -merge "$path" | cat + $merge_tool "$LOCAL" "$REMOTE" -merge "$path" | cat fi check_unchanged save_backup ;; - emerge) + emacs) if base_present ; then - emacs -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$BASE" "= $path" + $merge_tool -f emerge-files-with-ancestor-command "$LOCAL" "$REMOTE" "$B= ASE" "$path" else - emacs -f emerge-files-command "$LOCAL" "$REMOTE" "$path" + $merge_tool -f emerge-files-command "$LOCAL" "$REMOTE" "$path" fi status=3D$? save_backup @@ -293,8 +293,11 @@ done if test -z "$merge_tool"; then merge_tool=3D`git-config merge.tool` case "$merge_tool" in - kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | "") + kdiff3 | tkdiff | xxdiff | meld | opendiff | emacs | vimdiff | "") ;; # happy + emerge) + merge_tool=3Demacs + ;; *) echo >&2 "git config option merge.tool set to unknown tool: $merge_to= ol" echo >&2 "Resetting to default..." @@ -305,7 +308,7 @@ fi =20 if test -z "$merge_tool" ; then if type kdiff3 >/dev/null 2>&1 && test -n "$DISPLAY"; then - merge_tool=3D"kdiff3"; + merge_tool=3Dkdiff3 elif type tkdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then merge_tool=3Dtkdiff elif type xxdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then @@ -315,7 +318,7 @@ if test -z "$merge_tool" ; then elif type opendiff >/dev/null 2>&1; then merge_tool=3Dopendiff elif type emacs >/dev/null 2>&1; then - merge_tool=3Demerge + merge_tool=3Demacs elif type vimdiff >/dev/null 2>&1; then merge_tool=3Dvimdiff else @@ -325,18 +328,12 @@ if test -z "$merge_tool" ; then fi =20 case "$merge_tool" in - kdiff3|tkdiff|meld|xxdiff|vimdiff|opendiff) + emacs|kdiff3|meld|opendiff|tkdiff|vimdiff|xxdiff) if ! type "$merge_tool" > /dev/null 2>&1; then echo "The merge tool $merge_tool is not available" exit 1 fi ;; - emerge) - if ! type "emacs" > /dev/null 2>&1; then - echo "Emacs is not available" - exit 1 - fi - ;; *) echo "Unknown merge tool: $merge_tool" exit 1 --kqY5KO+rxsrm5KML Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQFG5vXqfBKgtDjnu0YRAv4gAJ44BLicQFoN8DRgXn7IPWBhZZooxwCeJJk9 DeIocibvhvVX9+JKW+HMvAE= =CawN -----END PGP SIGNATURE----- --kqY5KO+rxsrm5KML--