[PATCH 1/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 1/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> the template pages contain two entry named #parent1# and #parent2#; this is no +good because with the template system implemented in hgweb both the functions can be replaced with only one entry named "#parent#". The code in hgweb will replace this tag with the appropriate number of parents (+one, two... or more if and when will be used ). The first two patch perform this change in two step: 1) change the code to manage only one entry ( #parent1# ) 2) remove any reference to #parent2#, and change both the code and the templates to rename #parent1# in #parent2# the last three patchs are clean-up. The patch are five - - patch #1: - - clean the code in order to ignore #parent2# and use only #parent1# hgweb: chanage the parent1/parent2 code managment manifest hash: 6ba707904edf176c7269f2d9b80502902e6934c6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxvivywK+sNU5EO8RAkotAJ4vbR0KE+Jem20rQbaJxy8NRFeyJgCdHy2M hxmeD9erv17BrSKLGd5QAQI= =Or/F -----END PGP SIGNATURE-----

     1

#!/bin/sh

     2

     3

export HGMERGE=true

     4

     5

set -ex

     6

mkdir r1

     7

cd r1

     8

hg init

     9

echo a > a

    10

hg addremove

    11

hg commit -t "1" -u test -d "0 0"

    12

    13

hg clone . ../r2

    14

cd ../r2

    15

hg up

    16

echo abc > a

    17

hg diff > ../d

    18

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    19

    20

cd ../r1

    21

echo b > b

    22

echo a2 > a

    23

hg addremove

    24

hg commit -t "2" -u test -d "0 0"

    25

    26

cd ../r2

    27

hg -q pull ../r1

    28

hg status

    29

hg -d up

    30

hg -d up -m

    31

hg parents

    32

hg -v history

    33

hg diff > ../d

    34

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    35