repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix git-p4 rebase to detect the correct upstream branch instead of unconditionally
2007-06-12
S
imo
n
Hausmann
Fix
git-p4 r
e
base to detect
t
he
correct upstr
e
am b
r
a
nc
h
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-12
Simon Hausmann
Moved the
c
ode from git
-
p4 submit to figure out
t
he
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Marius S
t
orm-
O
lsen
Ensure that the commit
m
ess
a
g
e is Windows fo
r
mated
.
.
.
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Fix depot-path
determination for git-p
4
s
ubmi
t
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Si
m
on Hausma
n
n
F
ix git
-
p4 su
b
m
it
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon
Hausmann
Fix git-p4 re
b
ase
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon Hausmann
Hack t
o
make the multi-branch import work
a
gain with
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
Simon
H
ausm
a
n
n
Don'
t
attempt to s
e
t the i
n
itialParen
t
on multi-branc
h
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
imon Hau
s
mann
Fix common path "calculation
"
from logs of
m
ultiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-06-07
S
i
mon Hausmann
F
ix su
p
port for
"
depo
t
-path"
i
n
older
g
i
t-p4 im
p
orts
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon
H
a
u
s
mann
S
hortcut the case whe
r
e we have no origin branch
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Simon Hausmann
M
a
ke --with-ori
g
i
n the de
f
ault for syncing
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-25
Sim
o
n
H
ausmann
M
a
ke --with
-
o
r
igi
n
also wo
r
k
wit
h
out origin :)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-24
Marius Storm-Olsen
R
e
pl
a
ce \r\n with \n when
impor
t
ing from p4
o
n Windows
commit
|
commitdiff
|
tree
2007-05-23
Sim
o
n Hausmann
F
i
x m
u
lti-b
r
anch import with
--sile
n
t
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon H
a
usmann
Fix
p4 ex
e
c
ution in
g
i
t-
p
4 rol
l
back
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
H
au
s
mann
C
a
t
c
h
p4 errors i
n
ro
l
lb
a
c
k
early enough (b
e
fore deletin
g
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
i
mon Hausm
a
nn
Oops, f
i
ll the /list/
c
orrect with the p4 exit code
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
S
imon Hausmann
Don't m
a
ke len(p4Cmd
(
"p4 changes -
m
1 //foo/
.
.
.
"
))
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Simon
H
a
u
smann
Make rollback work wit
h
lo
c
ally
importe
d
branches
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-23
Si
m
on Hau
s
mann
Avoid calling git symbolic-
r
ef refs/heads/p4//H
E
AD
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausman
n
Use refs
/
heads/* i
n
s
t
e
a
d of refs/hea
d
s
/
p4/* for l
o
cal
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon Hausmann
A
d
ded support for --max-ch
a
nges=<count> to ea
s
e impo
r
t
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-22
Simon
H
ausmann
Added supp
o
rt for imp
o
rting mu
l
tiple
branches into
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
S
i
m
o
n
Hausmann
Fix
e
s for
r
ollback, delete branche
s
that did n
o
t
exis
t
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
F
ix br
a
n
ch de
t
ection in multi-branch imports
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simo
n
Hausmann
Adde
d
a
r
o
llback command
for debuggin
g
.
It sets back
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simo
n
Hausmann
Make git-p4 submit --di
r
ect safer by a
l
so creatin
g
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausmann
Detec
t
with
g
it-p4 subm
i
t --direct when the
r
e ar
e
no
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simo
n
H
ausmann
F
ix git symbol
i
c-
r
ef
w
a
rnin
g
on ini
t
ial c
l
o
n
e
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-21
Simon Hausman
n
Fix error detecti
o
n with git-p4
submit wh
e
n the req
u
ested
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
S
i
mo
n
Hausmann
Improved output for mult
i
b
r
anch impo
r
ts
and n
o
ted
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-20
Si
m
on
Hau
s
mann
Spec
i
fying --detect-
b
ra
n
ches is now only ne
e
ded for
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon H
a
usmann
R
e
mo
v
ed unused
v
aria
b
le, more c
l
eanups
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
Simon Hausmann
Mo
r
e
cleanups and speedups for labels a
n
d
bran
c
he
s
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
S
i
mon Ha
u
smann
Cl
e
anup/speed up the branch<> file
spli
t
and re
m
oved
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-19
S
imo
n
Hausmann
M
or
e
w
ork o
n
the increment
a
l importing
of multiple
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Gi
v
e branches
a nice project pref
i
x and don't
b
ail
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simo
n
Ha
u
smann
St
a
rted rewrit
i
ng the branch detection, based on "p4
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon H
a
u
s
mann
R
emoved
u
nused cache variables
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-18
Simon Hausmann
Fi
x
branch setup aft
e
r initi
a
l
clone
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Haus
m
ann
A litt
l
e todo no
t
e befo
r
e I
f
orget it :), based on
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon Ha
u
sma
n
n
Fix
ca
l
ling git-p4 reba
s
e from
w
i
t
h
i
n a subd
i
rect
o
ry
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
S
im
o
n Hausman
n
Give a better hint i
f
git-p4 submit f
a
ils
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-16
Simon
H
ausmann
Added th
e
possibil
i
ty of s
k
i
p
p
i
ng pa
t
ches during git
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Fix git-p4 clone //
d
epot
/
pro
j
ect
(head import)
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
Marius
S
torm
-
Olsen
M
ake the c
o
mmand c
a
ll
s
ilent
commit
|
commitdiff
|
tree
2007-05-15
Si
m
o
n
H
au
s
m
ann
Converted
t
o unix newlines
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Ha
u
s
mann
Make submitting work on Win
d
o
w
s
.
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
M
a
ke sure all popen calls
use binary mode (for Wi
n
dows
.
.
.
commit
|
commitdiff
|
tree
2007-05-15
S
im
o
n Ha
u
sman
n
Added a little
.
bat
w
r
a
p
p
er from Marius
commit
|
commitdiff
|
tree
2007-05-15
S
imon H
a
usmann
Use t
h
e subproce
s
s module instead of popen2 to make
.
.
.
commit
|
commitdiff
|
tree
2007-03-23
Sim
o
n Hausmann
Use the new incremen
t
al import
s
t
y
le by default
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Don't print a plain
newline at th
e
en
d
of
the execution
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-02-10
Simon Ha
u
s
mann
Added a little he
l
p
e
r scrip
t
to remove un
u
sed tags
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon
H
ausm
a
nn
Imple
m
ented ba
s
ic suppor
t
for co
n
v
e
rting
t
h
e date of
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Slightly im
p
r
oved help us
a
ge output
and
m
ade spe
c
i
f
ying
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-31
Simon Hausmann
Added
basic support for specifyin
g
t
he depot
p
ath t
o
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree
2007-01-30
Simon H
a
usm
a
n
n
Initial import of a python s
c
r
i
p
t
to import changese
t
s
.
.
.
Signed-off-by: Simon Hausmann <
shausman@trolltech.com
>
commit
|
commitdiff
|
tree