repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Hack to make the multi-branch import work again with self.depotPaths now that
2007-06-07
Simo
n
Hausm
a
n
n
Hack to
m
ake the multi-br
a
n
ch import w
o
rk again
w
it
h
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Don't
attempt to set th
e
initialParent on
mu
l
ti-br
a
nch
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Haus
m
ann
F
i
x
common path "calculation" from lo
g
s of m
u
ltiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
imon Hausmann
F
ix support
f
or "
d
e
p
o
t
-
path" in older
g
it-p4 im
p
orts
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
Shortcut the
case where w
e
have n
o
origin branch
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simo
n
Hausmann
Make --with-origin
t
h
e
de
f
ault for
s
yncing
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Si
m
on Hausmann
Make --with-origin also work
w
i
t
hout origin :)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
imon
H
ausmann
Fi
x
mul
t
i-branch import with
--si
l
ent
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon H
a
usmann
Fix
p
4
execution in gi
t
-p4 rol
l
b
ack
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Ha
u
sma
n
n
Catch p
4
errors in rol
l
back early e
n
ough (before deleting
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Ha
u
sm
a
n
n
Oops, fill t
h
e
/
list
/
correct wi
t
h
the p4 exit
c
od
e
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Sim
o
n Haus
m
an
n
D
on't mak
e
len(p4Cmd("p4 cha
n
ges -
m
1 //f
o
o/
.
.
.
"))
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon Ha
u
sm
a
nn
Mak
e
r
ollback
work with locally imported b
r
anches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Sim
o
n H
a
usmann
Avoid
c
a
lling git
symbol
i
c-
r
ef refs
/
heads/p4//H
E
A
D
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
S
imon
H
ausmann
Us
e
refs/heads/* inst
e
a
d of refs/
h
eads/p4/*
for local
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
A
d
ded
supp
o
rt for
-
-max-changes=<count> t
o
ease im
p
or
t
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simo
n
Hausmann
Added
s
upp
o
rt
f
or im
p
orti
n
g m
u
ltiple b
r
anches into
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simo
n
Hausmann
Fix
e
s f
o
r rollb
a
ck, delete branc
h
e
s
that did n
o
t
e
xist
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
imon
Haus
m
a
nn
Fix branch de
t
ection in multi-branch import
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Added a rollback comman
d
f
or debug
g
i
n
g
.
It set
s
back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausman
n
M
a
ke git-p4 su
b
mit --direct s
a
f
er by
a
lso c
r
ea
t
ing
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
ausmann
Dete
c
t with git-p4 subm
i
t
--direct when there are no
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Haus
m
ann
F
i
x
git symbol
i
c-ref warning on initial
c
l
o
ne
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon
H
ausmann
Fix error detecti
o
n with git-p4 su
b
mit
when the requested
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
S
i
mon Hausman
n
Im
p
rov
e
d outp
u
t for multi bra
n
ch im
p
orts
and noted
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Simon H
a
usmann
Specifying --detect-branche
s
is now only n
e
eded for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
Remov
e
d unuse
d
variable, more c
l
ean
u
p
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausm
a
nn
Mor
e
c
l
eanups and
speedu
p
s for labels and branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
Clean
u
p/sp
e
ed
u
p the b
r
anch<> file split an
d
removed
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
S
i
mon Hausma
n
n
More work on the in
c
reme
n
tal impor
t
ing of
mul
t
i
p
le
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon H
a
us
m
ann
Give branches a nice pr
o
j
e
ct prefix and don't bail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
S
i
mon H
a
usmann
Started rewrit
i
ng the branch
d
e
tecti
o
n, b
a
sed on "p
4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Si
m
on Ha
u
smann
Removed unused cache variables
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Fix branc
h
setup after initi
a
l clone
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausm
a
nn
A li
t
t
le
t
odo note before I forget it
:
), base
d
o
n
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Haus
m
ann
Fix calling
g
it-p4 re
b
ase from wit
h
in a subdi
r
ector
y
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Hausmann
Give a better hint i
f
git-p4 submi
t
fails
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hau
s
man
n
Added
t
h
e
poss
i
bility of skipping patche
s
during git
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon
Haus
m
ann
Fix
git-p4
c
lone //d
e
p
o
t
/
pr
o
je
c
t
(head import)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hau
s
mann
C
onver
t
ed to unix newl
i
nes
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-03-23
S
i
m
on Hau
s
m
a
nn
Use the n
e
w increment
a
l import style by de
f
ault
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Sim
o
n
Ha
u
sm
a
nn
Don't p
r
in
t
a
plain newline at the en
d
of the execution
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Hausmann
Ad
d
ed a lit
t
le
helper
s
cript to re
m
ove unused
t
a
gs
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Si
m
o
n
Hausmann
Impleme
n
ted basic support for c
o
n
v
erting the
d
ate of
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Hausmann
S
l
i
g
htly improved help usage output and made
s
pecifyin
g
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
S
i
mon Ha
u
sman
n
Adde
d
basic s
u
p
p
ort fo
r
specifying the d
e
pot p
a
t
h
to
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
Simon Hau
s
mann
Init
i
al import
o
f
a
p
y
thon script to import changese
t
s
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree