]> git.lizzy.rs Git - plan9front.git/blob - sys/src/cmd/git/branch
bf2027cc73bacc976f340efa23b8c10667470f2c
[plan9front.git] / sys / src / cmd / git / branch
1 #!/bin/rc -e
2 rfork en
3 . /sys/lib/git/common.rc
4
5 gitup
6
7 flagfmt='a:listall, b:baseref ref, d:delete, n:newbr, s:stay, m:merge'
8 args='[branch]'
9 eval `''{aux/getflags $*} || exec aux/usage
10
11 modified=()
12 deleted=()
13
14 if(~ $#* 0){
15         if(~ $#listall 0)
16                 awk '$1=="branch"{print $2}' < $gitfs/ctl
17         if not
18                 cd .git/refs/ && walk -f heads remotes
19         exit
20 }
21 if(! ~ $#* 1)
22         exec aux/usage
23
24 branch=$1
25 if(~ $branch refs/heads/*)
26         new=$name
27 if not if(~ $branch heads/*)
28         new=refs/$branch
29 if not
30         new=refs/heads/$branch
31
32 orig=`{git/query HEAD}
33 if (~ $#baseref 1)
34         base=`{git/query $baseref} || exit 'bad base'
35 if not if(test -e .git/$new)
36         base=`{git/query $new}
37 if not
38         base=`{git/query HEAD}
39
40 if(~ $#newbr 0){
41         if(! ~ $#baseref 0)
42                 die update would clobber $branch with $baseref
43         baseref=`$nl{echo -n $new | sed s@refs/heads/@refs/remotes/origin/@}
44         echo $baseref
45         if(! test -e .git/$new)
46                 if(! base=`{git/query $baseref})
47                         die could not find branch $branch
48 }
49 modified=`$nl{git/query -c HEAD $base | grep '^[^-]' | subst '^..'}
50 deleted=`$nl{git/query -c HEAD $base | grep '^-' | subst '^..'}
51
52 if(! ~ $#modified 0 || ! ~ $#deleted 0 && ~ $#merge 0){
53         git/walk -fRMA $modified $deleted || 
54                 die 'uncommited changes would be clobbered'
55 }
56 if(~ $delete 1){
57         rm -f .git/$new
58         echo 'deleted branch' $new
59         exit
60 }
61 commit=`{git/query $base} || die 'branch does not exist:' $base
62 if(~ $new */*)
63         mkdir -p .git/`{basename -d $new}
64 if(! ~ $#stay 0){
65         echo $commit > .git/$new
66         exit
67 }
68 basedir=`{git/query -p $base}
69 dirtypaths=()
70 if(! ~ $#modified 0 || ! ~ $#deleted 0)
71         dirtypaths=`$nl{git/walk -cfRMA $modified $deleted}
72 if(! ~ $#modified 0 || ! ~ $#deleted 0)
73         dirtypaths=`$nl{git/walk -cfRMA $modified $deleted}
74 if(~ $#dirtypaths 0)
75         cleanpaths=($modified $deleted)
76 if not {
77         cleanpaths=()
78         for(p in $modified $deleted)
79                 if(! ~ $p $dirtypaths)
80                         cleanpaths=($cleanpaths $p)
81 }
82
83 echo $commit > .git/$new
84 for(m in $cleanpaths){
85         d=`$nl{basename -d $m}
86         mkdir -p $d
87         mkdir -p .git/index9/tracked/$d
88         # Modifications can turn a file into
89         # a directory, or vice versa, so we
90         # need to delete and copy the files
91         # over.
92         a=dir
93         b=dir
94         if(test -f $m)
95                 a=file
96         if(test -f $basedir/tree/$m)
97                 b=file
98         if(! ~ $a $b){
99                 rm -rf $m
100                 rm -rf .git/index9/tracked/$m
101         }
102         if(~ $b file){
103                 cp -x $basedir/tree/$m $m
104                 walk -eq $m > .git/index9/tracked/$m
105         }
106 }
107
108 for(ours in $dirtypaths){
109         common=$gitfs/object/$orig/tree/$ours
110         theirs=$gitfs/object/$base/tree/$ours
111         merge1 $ours $ours $common $theirs
112 }
113
114 if(! ~ $#deleted 0){
115         rm -f $deleted
116         rm -f .git/index9/tracked/$deleted
117 }
118
119 echo ref: $new > .git/HEAD
120 exit ''