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
Consolidate command list to one.
2007-05-17
Simo
n
H
a
usmann
Added support
f
or git-p4
s
yn
c
/rebase --
w
ith-origin
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Bit
e
t
h
e
bullet
and
a
u
t
omatically convert old style
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon
H
ausmann
Changed the default p4 import bra
n
ch
to be re
f
s/r
e
motes
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Haus
m
ann
Create
t
h
e
origin based import b
r
anch usi
n
g git update
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Sim
o
n Ha
u
smann
Rem
o
ved ancient and unused
cod
e
to find the last imp
o
rted
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Ha
u
sman
n
Removed cleantags
c
o
m
mand
.
It do
e
sn't
have an
y
meaning
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Clean
u
p
code duplication
fo
r
revisio
n
parsi
n
g
an
d
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausmann
Always
p
a
s
s a s
h
a1 for the i
n
itial parent so that git
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-17
Simon Hausman
n
Fixing syncing
(git
d
ir discovery /
c
d
)
for b
a
re repositories
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-16
Simon Hausmann
A
little tod
o
no
t
e
bef
o
re I
f
o
rget it :), based on
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
S
i
mon Hausman
n
Fix ca
l
l
ing git-p
4
r
e
base from within a subdirec
t
or
y
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Sim
o
n
Hausmann
Give a bett
e
r h
i
nt
i
f git-p4 s
u
b
m
it fails
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-16
Simon Haus
m
ann
Added t
h
e
p
o
ssibility of s
k
ippin
g
p
atches during git
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hau
s
m
an
n
Make git-p4
w
ork with
b
are repo
s
ito
r
ies
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-15
S
i
mon Hausmann
Fix git-p4 c
l
one //depot/project (head impor
t
)
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Conve
r
ted to unix
n
ewline
s
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Make submitting work o
n
Wi
n
dows
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
S
im
o
n H
a
usmann
Make s
u
re al
l
popen ca
l
ls use binary mode (for Windows
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simon Hausmann
Added a little
.
bat wrapper
from Marius
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-15
Simo
n
Hau
s
m
a
nn
U
s
e the subpr
o
ces
s
m
odule instea
d
o
f popen2 to make
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-05-07
S
i
mon Ha
u
sm
a
n
n
Document
s
ome implemen
t
at
i
on de
t
a
i
ls, for the curious
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausman
n
Clean
u
p, removed th
e
ol
d
tag
g
i
ng code
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hausmann
c
l
e
a
nup,
r
enamed
s
elf
.
globalPrefi
x
to self
.
dep
o
tPath
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon Hau
s
ma
n
n
Micro cleanup
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-05-01
Simon
Hausma
n
n
Doc cl
e
anups
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Sim
o
n Haus
m
ann
Handle patch errors in git-p4
sub
m
i
t bett
e
r
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-15
Simon Ha
u
smann
A new attempt a
t
fixin
g
the c
h
i
l
d-fast-import-p
r
ocess
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon
H
ausm
a
n
n
Slightly
i
mproved formatti
n
g of the ra
w
_input q
u
e
s
tions
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausmann
Removed the
o
l
d
patch
a
p
ply c
o
de
f
r
om gi
t
-
p
4 s
u
bmit
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-14
Simon Hausma
n
n
Fix the timezone formatti
n
g
.
Now qgi
t
al
s
o
d
i
splays
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-13
S
i
m
o
n Hausm
a
nn
Print
an error m
e
ssa
g
e of some
s
ort if git fast-impo
r
t
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-09
Si
m
o
n
Hausmann
Allow for convenient
r
ebasing after
g
it-p4 sub
m
it
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon
Hausmann
Added a simpl
e
ex
a
m
p
le of us
a
ge to the "d
o
cume
n
tatio
n
" :)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausma
n
n
fix va
r
iabl
e
usag
e
(oo
p
s)
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
Fix file det
e
rminat
i
o
n
for #head i
m
ports
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Simon Hausmann
A
dded git-p4 clone c
o
nvenience command
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-08
Sim
o
n
Hausmann
H
o
nor --
s
ilent for
l
a
bels
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon Hausman
n
Turn off potentially slow label detection by default
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausm
a
n
n
Provide
a
tree summary after git-p4 rebase
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-07
Simon
H
ausma
n
n
Added
g
it-p4
r
e
b
as
e
conven
i
en
c
e
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-04-01
S
imon H
a
usm
a
nn
Clean up pytho
n
class names
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-04-01
Simon Hausmann
Fix "comp
i
lation" :)
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-29
Simo
n
Hausmann
F
i
x the
d
ocs
for git-p4 submit a
n
d
t
u
rn git-
p
4
s
ubmit
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-28
S
i
mon Hausmann
Fix variable usage in
t
ag import
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
Simon Hau
s
mann
A
d
de
d
su
p
po
r
t for mapping p4 labels to
gi
t
tags
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-26
S
i
m
o
n Haus
m
an
n
g
i
t-p4 debug doesn't
n
eed a git
repository
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-25
Simon Hausm
a
nn
D
o
n't try to parse any options
w
i
th gi
t
-p4
d
ebu
g
b
ut
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
S
imon Hausma
n
n
Prefe
r
gi
t
c
omman
d
over git-command
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Si
m
on Hausmann
M
inor cosm
e
tic fixl
e
t for the git-p4 submi
t
sync que
s
tion
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-24
Simon
H
ausmann
Differe
n
t
ve
r
s
ions of p4
hav
e
dif
f
ere
n
t output
f
o
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-23
Simon Haus
m
ann
Use the new increm
e
ntal i
m
port style by
d
e
fault
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-03-23
Simon H
a
usma
n
n
Make it pos
s
ible to run git
-
p4 submit from wit
h
in the
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-22
S
imon Ha
u
smann
Bran
d
new smar
t
incr
e
ment
a
l import that
d
o
e
sn't n
e
ed
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
S
e
t
th
e
default branch in run, not i
n
the constructor
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
S
i
mon Hausmann
Helper function to check the existan
c
e of
a
revision
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
A
dded so
m
e helper
f
uncti
o
n(s) to parse the depot path
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon
Hausma
n
n
Chan
g
ed the de
f
au
l
t branch
f
or imports fro
m
"mast
e
r
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Si
m
o
n Hausman
n
Changed the
f
ormat
o
f the importe
d
l
og m
e
ssage slightly
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-22
Simon Hausmann
Removed the
.
py ex
t
en
s
ion from
g
i
t-p4 as it's a
n
noying
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Haus
m
ann
Don't show the submit template
and the diff first in
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-21
Sim
o
n H
a
usmann
Make it po
s
sible to inv
o
ke
g
it-p4 from within s
u
bdirectories
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon
H
ausmann
M
a
de --apply-as-patch
t
he default for
g
it-p4 sub
m
it
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Fix support for deleti
o
ns in git-p4 submit when u
s
ing
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simo
n
Hausmann
A
dde
d
ex
p
eriment
a
l but super-
f
ast -
-
apply-as-patch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-21
Simon Hausm
a
nn
Documentation enhanc
e
m
ents
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-20
S
imon Hausmann
Start
o
f the git-p
4
d
o
c
umentation
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hau
s
mann
R
e
mov
e
d p4-f
a
st-exp
o
r
t
and p4-git-sync a
s
they've been
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon
Hausmann
Fixed the i
n
i
t
ial
version import
by get
t
i
n
g the f
i
le
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausm
a
nn
Adde
d
m
i
ss
i
ng "s
e
lf"s to make the s
c
ript evaluate c
o
rrectl
y
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
Completely u
n
t
e
s
t
ed "
m
erge" of
p4
-
fast-export
.
py into
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-20
Simon Hausmann
s
y
n
c
-to-perforce is now called su
b
mit and
fixed t
h
e
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hau
s
m
ann
Part of the code is c
o
pyright
b
y
T
rolltech
A
SA
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
aus
m
ann
First (u
n
te
s
ted) attempt at
migrati
n
g p4-git
-
sync i
n
to
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Pr
o
vide
a
littl
e
b
i
t
of help
d
escriptio
n
for the g
i
t
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausm
a
nn
S
tart movin
g
th
e
git-p4 too
l
s into one si
n
g
l
e script
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon
H
ausmann
Pass the ri
g
ht
number of arguments
t
o commit,
fix
e
s
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-19
Simon Hausmann
Improved
t
h
e
git
dir d
e
tection
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-16
Simon Hau
s
ma
n
n
Defa
u
lt to interactive syncing
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-15
Sim
o
n Hausmann
Use
p
4 rev
e
rt
.
.
.
i
nstead of revert -a
.
.
.
after submitting
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Auto-detect the current git branch bef
o
re subm
i
ttin
g
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Simon Hausmann
Igno
r
e Apple resource files when
i
mporting from perforc
e
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
Be
nice and use /usr/bin/
e
nv python for th
e
git-p4
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-14
Si
m
on Hausmann
Automatically operate on a tempo
r
a
r
y br
a
nch, needed
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
Si
m
on
H
ausmann
Lots of
bugfixes to p4-git-sync
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-13
S
i
mon Hausma
n
n
Fix git-dir
o
ption and
a
llow reading log subst
i
tutions
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-12
Simon Hausmann
Fir
s
t version of a n
e
w
scr
i
pt to submit
c
h
an
g
es back
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hau
s
mann
Split up the cache commandl
i
n
e option
s
into (comm
a
nd
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
s
mann
Reduce the number of false "merges" b
y
skipping "branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausm
a
nn
More work on branch detec
t
ion by im
p
lementing changeI
s
B
r
a
n
c
h
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
S
imon Hau
s
mann
More code clea
n
ups and p
r
epa
r
at
i
ons for more branch
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Minor cod
e
clea
n
ups
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-10
Simon Ha
u
smann
Make the
p
4 data/comm
a
nd cac
h
e configurabl
e
t
hro
u
gh
.
.
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-10
Simon Hausmann
Fi
x
ed p
4
-debug file
e
xtension
.
Signed-off-by:
Simon Hausmann
<simon@lst.de>
commit
|
commitdiff
|
tree
2007-03-08
Simon Hausmann
Changed --known-branches
t
o
take a file
as argument
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-08
Simon
H
a
u
s
mann
Work
in progress on det
e
cting b
r
anche
s
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-03-07
Simon Hausma
n
n
A
djust the output pa
r
sing
of git name
-
rev
t
o handle
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausm
a
nn
Don'
t
pr
i
nt a
p
lai
n
newline at the end of the exec
u
tio
n
.
.
.
Signed-off-by:
Simon Hausmann
<shausman@trolltech.com>
commit
|
commitdiff
|
tree
2007-02-22
Simon Hausmann
Mor
e
work i
n
--silent support
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-22
Simon Ha
u
smann
Added support for --silent so that
p4-fa
s
t-export can
.
.
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
2007-02-21
Simon
H
a
u
smann
Added
p
4 delete
beha
v
iour
a
l emulation as
t
od
o
it
e
m
.
Signed-off-by:
Simon Hausmann
<hausmann@kde.org>
commit
|
commitdiff
|
tree
next